diff options
| author | Nick Cao <nickcao@nichi.co> | 2023-11-27 10:41:49 -0500 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2023-11-28 13:26:31 +0000 |
| commit | 04eaa9179b0c0e89b1cb090a9fa13e2101478810 (patch) | |
| tree | cb617ebe3bbaccb9fd775ecb4c3e62803d72258f | |
| parent | qt6.qtbase: refresh patches (diff) | |
| download | nixpkgs-04eaa9179b0c0e89b1cb090a9fa13e2101478810.tar.gz | |
qt6.qtbase: derive plugin load path from PATH
(cherry picked from commit da086000735e4987c922f949c48b11a494ceb251)
| -rw-r--r-- | pkgs/development/libraries/qt-6/modules/qtbase.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix index c0a20503e64c..edf29ab8d36f 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -11,11 +11,9 @@ , lndir , perl , pkg-config -, python3 , which , cmake , ninja -, ccache , xmlstarlet , libproxy , xorg @@ -236,11 +234,13 @@ stdenv.mkDerivation rec { "-DQT_FEATURE_cxx17_filesystem=OFF" ] ++ lib.optional (qttranslations != null) "-DINSTALL_TRANSLATIONSDIR=${qttranslations}/translations"; - NIX_LDFLAGS = toString (lib.optionals stdenv.isDarwin [ + env.NIX_LDFLAGS = toString (lib.optionals stdenv.isDarwin [ # Undefined symbols for architecture arm64: "___gss_c_nt_hostbased_service_oid_desc" "-framework GSS" ]); + env.NIX_CFLAGS_COMPILE = "-DNIXPKGS_QT_PLUGIN_PREFIX=\"${qtPluginPrefix}\""; + outputs = [ "out" "dev" ]; moveToDev = false; |