From bf5a65096c94da69551d8b8f6274385eba062e35 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 3 Jan 2023 15:39:40 +0300
Subject: [PATCH] pkgs/all-packages: remove unused alias, add comment
---
doc/languages-frameworks/qt.section.md | 6 ++++--
pkgs/top-level/all-packages.nix | 5 +----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/doc/languages-frameworks/qt.section.md b/doc/languages-frameworks/qt.section.md
index 696031268ed9..e09194e391e1 100644
--- a/doc/languages-frameworks/qt.section.md
+++ b/doc/languages-frameworks/qt.section.md
@@ -3,8 +3,10 @@
Writing Nix expressions for Qt libraries and applications is largely similar as for other C++ software.
This section assumes some knowledge of the latter.
-However, Qt makes extensive use of runtime dependency detection.
-In nixpkgs, those runtime dependencies are made into build dependencies through wrappers.
+The major caveat with Qt applications is that Qt uses a plugin system to load additional modules at runtime,
+from a list of well-known locations. In Nixpkgs, we patch QtCore to instead use an environment variable,
+and wrap Qt applications to set it to the right paths. This effectively makes the runtime dependencies
+pure and explicit at build-time, at the cost of introducing an extra indirection.
## Nix expression for a Qt package (default.nix) {#qt-default-nix}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3dbe4491b0f4..8ff5ca883e51 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22393,6 +22393,7 @@ with pkgs;
});
# TODO: remove once no package needs this anymore or together with OpenSSL 1.1
+ # Current users: mumble, murmur
qt5_openssl_1_1 = qt5.overrideScope' (_: super: {
qtbase = super.qtbase.override {
openssl = openssl_1_1;
@@ -22402,10 +22403,6 @@ with pkgs;
};
};
});
- libsForQt5_openssl_1_1 = import ./qt5-packages.nix {
- inherit lib pkgs;
- qt5 = qt5_openssl_1_1;
- };
# plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop
plasma5Packages = libsForQt5;