diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-02-25 14:03:43 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-02-27 11:49:16 -0600 |
| commit | d446303d0bab3675d1d30fc9a75f17904780c360 (patch) | |
| tree | 88f37244e81b1ccbc89c7330cd113e6339ce6362 /pkgs/desktops | |
| parent | a33ab04d1b7ab4e8df867e8e05cb5b55222d5fe5 (diff) | |
Move kdeDerivation out of kdeFrameworks
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/kde-5/applications/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/desktops/plasma-5/default.nix | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/desktops/kde-5/applications/default.nix b/pkgs/desktops/kde-5/applications/default.nix index a53bbedc2c54..832b88c7e803 100644 --- a/pkgs/desktops/kde-5/applications/default.nix +++ b/pkgs/desktops/kde-5/applications/default.nix @@ -27,7 +27,7 @@ still shows most of the available features is in `./gwenview.nix`. { stdenv, lib, libsForQt5, fetchurl, - plasma5, + kdeDerivation, plasma5, attica, phonon, debug ? false, }: @@ -40,9 +40,8 @@ let packages = self: with self; { kdeApp = import ./kde-app.nix { - inherit lib; + inherit lib kdeDerivation; inherit debug srcs; - inherit (libsForQt5) kdeDerivation; }; kdelibs = callPackage ./kdelibs { diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 683154273ae6..b240ef7496c6 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -26,7 +26,7 @@ existing packages here and modify it as necessary. { stdenv, lib, libsForQt5, makeSetupHook, symlinkJoin, fetchurl, - gconf, + gconf, kdeDerivation, debug ? false, }: @@ -41,7 +41,7 @@ let inherit (args) name; sname = args.sname or name; inherit (srcs."${sname}") src version; - in libsForQt5.kdeDerivation (args // { + in kdeDerivation (args // { name = "${name}-${version}"; inherit src; |