diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-29 17:52:58 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-29 20:03:46 +0200 |
commit | d65af1353372200e65f3a4cb87f07242af113802 (patch) | |
tree | 1b560cb7b6a65fbaaa3b97447dc724d330116e13 /pkgs/desktops | |
parent | 423eebde88f277c4218b68931b7577ca187ce6a6 (diff) | |
download | nixlib-d65af1353372200e65f3a4cb87f07242af113802.tar nixlib-d65af1353372200e65f3a4cb87f07242af113802.tar.gz nixlib-d65af1353372200e65f3a4cb87f07242af113802.tar.bz2 nixlib-d65af1353372200e65f3a4cb87f07242af113802.tar.lz nixlib-d65af1353372200e65f3a4cb87f07242af113802.tar.xz nixlib-d65af1353372200e65f3a4cb87f07242af113802.tar.zst nixlib-d65af1353372200e65f3a4cb87f07242af113802.zip |
kde4: Eliminate dev outputs from the closure
Obviously there are more improvements that can be done here, especially moving headers to .dev, but that's not entirely trivial and probably not worth it since kde4 is old.
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/kde-4.14/kactivities.nix | 6 | ||||
-rw-r--r-- | pkgs/desktops/kde-4.14/kdepimlibs.nix | 6 | ||||
-rw-r--r-- | pkgs/desktops/kde-5/applications/kdelibs/default.nix | 6 |
3 files changed, 17 insertions, 1 deletions
diff --git a/pkgs/desktops/kde-4.14/kactivities.nix b/pkgs/desktops/kde-4.14/kactivities.nix index 9a08b58e1ea4..a1f9d0d81719 100644 --- a/pkgs/desktops/kde-4.14/kactivities.nix +++ b/pkgs/desktops/kde-4.14/kactivities.nix @@ -7,6 +7,12 @@ kde { sha256 = "12l9brpq8mr9hqqmnlz9xfsfr8ry6283b32nfqfx0p3f7w19vjy7"; }; + outputs = [ "out" "dev" ]; + + outputInclude = "out"; + + setOutputFlags = false; + propagatedBuildInputs = [ kdelibs nepomuk_core ]; meta = { diff --git a/pkgs/desktops/kde-4.14/kdepimlibs.nix b/pkgs/desktops/kde-4.14/kdepimlibs.nix index ac62c970eec0..554d6acd9eb4 100644 --- a/pkgs/desktops/kde-4.14/kdepimlibs.nix +++ b/pkgs/desktops/kde-4.14/kdepimlibs.nix @@ -5,6 +5,12 @@ }: kde { + outputs = [ "out" "dev" ]; + + outputInclude = "out"; + + setOutputFlags = false; + nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; cmakeFlags = [ diff --git a/pkgs/desktops/kde-5/applications/kdelibs/default.nix b/pkgs/desktops/kde-5/applications/kdelibs/default.nix index ec57c908dc58..c7c8c250a838 100644 --- a/pkgs/desktops/kde-5/applications/kdelibs/default.nix +++ b/pkgs/desktops/kde-5/applications/kdelibs/default.nix @@ -9,7 +9,11 @@ kdeApp { name = "kdelibs"; - outputs = [ "out" ]; + outputs = [ "out" "dev" ]; + + outputInclude = "out"; + + setOutputFlags = false; nativeBuildInputs = [ automoc4 bison cmake flex libxslt perl pkgconfig shared_mime_info |