diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2019-07-05 10:41:41 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2019-07-05 10:41:41 -0500 |
| commit | f79fd2e826dd95b3b64839d3e0bec8ae1dfab17e (patch) | |
| tree | 6556b45a2f1a5d9b1de7ab9a7bf6093aac46bb62 /pkgs/desktops/plasma-5 | |
| parent | 0daecd2d7ae7f98e331c38f520b827e671ac1f74 (diff) | |
| download | nixpkgs-f79fd2e826dd95b3b64839d3e0bec8ae1dfab17e.tar nixpkgs-f79fd2e826dd95b3b64839d3e0bec8ae1dfab17e.tar.gz nixpkgs-f79fd2e826dd95b3b64839d3e0bec8ae1dfab17e.tar.bz2 nixpkgs-f79fd2e826dd95b3b64839d3e0bec8ae1dfab17e.tar.lz nixpkgs-f79fd2e826dd95b3b64839d3e0bec8ae1dfab17e.tar.xz nixpkgs-f79fd2e826dd95b3b64839d3e0bec8ae1dfab17e.tar.zst nixpkgs-f79fd2e826dd95b3b64839d3e0bec8ae1dfab17e.zip | |
wrapQtAppsHook: wrap Qt applications for runtime dependencies
Diffstat (limited to 'pkgs/desktops/plasma-5')
| -rw-r--r-- | pkgs/desktops/plasma-5/plasma-workspace/default.nix | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index 680021e350b..1403c9e4c8b 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -34,7 +34,8 @@ mkDerivation { qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland qtx11extras ]; - outputs = [ "bin" "dev" "out" ]; + propagatedUserEnvPkgs = [ qtgraphicaleffects ]; + outputs = [ "out" "dev" ]; cmakeFlags = [ "-DNIXPKGS_XMESSAGE=${getBin xmessage}/bin/xmessage" @@ -45,7 +46,7 @@ mkDerivation { "-DNIXPKGS_XPROP=${getBin xprop}/bin/xprop" "-DNIXPKGS_ID=${getBin coreutils}/bin/id" "-DNIXPKGS_DBUS_UPDATE_ACTIVATION_ENVIRONMENT=${getBin dbus}/bin/dbus-update-activation-environment" - "-DNIXPKGS_START_KDEINIT_WRAPPER=${getLib kinit}/lib/libexec/kf5/start_kdeinit_wrapper" + "-DNIXPKGS_START_KDEINIT_WRAPPER=${getLib kinit}/libexec/kf5/start_kdeinit_wrapper" "-DNIXPKGS_QDBUS=${getBin qttools}/bin/qdbus" "-DNIXPKGS_KWRAPPER5=${getBin kinit}/bin/kwrapper5" "-DNIXPKGS_KREADCONFIG5=${getBin kconfig}/bin/kreadconfig5" @@ -72,10 +73,6 @@ mkDerivation { preConfigure = '' NIX_CFLAGS_COMPILE+=" -DNIXPKGS_KDOSTARTUPCONFIG5=\"''${!outputBin}/bin/kdostartupconfig5\"" - cmakeFlags+=" -DNIXPKGS_STARTPLASMA=''${!outputBin}/lib/libexec/startplasma" - ''; - - postInstall = '' - moveToOutput lib/libexec/startplasma ''${!outputBin} + cmakeFlags+=" -DNIXPKGS_STARTPLASMA=''${!outputBin}/libexec/startplasma" ''; } |