diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-07-29 09:33:58 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-07-29 10:23:18 -0500 |
| commit | 6c79045964a2337de7d2a4a0787d7a696c326cc7 (patch) | |
| tree | 7b17b4aaf33e4e6737d881539bbec2dbc2ee4a4d /pkgs/desktops/kde-5 | |
| parent | 6628c559867f721f301732b4ce7bf5e00d917065 (diff) | |
| download | nixlib-6c79045964a2337de7d2a4a0787d7a696c326cc7.tar nixlib-6c79045964a2337de7d2a4a0787d7a696c326cc7.tar.gz nixlib-6c79045964a2337de7d2a4a0787d7a696c326cc7.tar.bz2 nixlib-6c79045964a2337de7d2a4a0787d7a696c326cc7.tar.lz nixlib-6c79045964a2337de7d2a4a0787d7a696c326cc7.tar.xz nixlib-6c79045964a2337de7d2a4a0787d7a696c326cc7.tar.zst nixlib-6c79045964a2337de7d2a4a0787d7a696c326cc7.zip | |
extra-cmake-modules: separate setup hook from package
Diffstat (limited to 'pkgs/desktops/kde-5')
| -rw-r--r-- | pkgs/desktops/kde-5/applications/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/desktops/kde-5/applications/kde-app.nix | 11 | ||||
| -rw-r--r-- | pkgs/desktops/kde-5/plasma/default.nix | 11 |
3 files changed, 5 insertions, 19 deletions
diff --git a/pkgs/desktops/kde-5/applications/default.nix b/pkgs/desktops/kde-5/applications/default.nix index d3dc48b52823..5b2c3847adf7 100644 --- a/pkgs/desktops/kde-5/applications/default.nix +++ b/pkgs/desktops/kde-5/applications/default.nix @@ -21,7 +21,7 @@ let packages = self: with self; { kdeApp = import ./kde-app.nix { - inherit stdenv lib; + inherit kdeDerivation lib; inherit debug srcs; }; diff --git a/pkgs/desktops/kde-5/applications/kde-app.nix b/pkgs/desktops/kde-5/applications/kde-app.nix index 2f1fdc1d643c..c0a947a65dad 100644 --- a/pkgs/desktops/kde-5/applications/kde-app.nix +++ b/pkgs/desktops/kde-5/applications/kde-app.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, debug, srcs }: +{ kdeDerivation, lib, debug, srcs }: args: @@ -7,17 +7,10 @@ let sname = args.sname or name; inherit (srcs."${sname}") src version; in -stdenv.mkDerivation (args // { +kdeDerivation (args // { name = "${name}-${version}"; inherit src; - outputs = args.outputs or [ "dev" "out" ]; - - cmakeFlags = - (args.cmakeFlags or []) - ++ [ "-DBUILD_TESTING=OFF" ] - ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; - meta = { platforms = lib.platforms.linux; homepage = "http://www.kde.org"; diff --git a/pkgs/desktops/kde-5/plasma/default.nix b/pkgs/desktops/kde-5/plasma/default.nix index f6bbd5c3f51e..2299e9fbc2aa 100644 --- a/pkgs/desktops/kde-5/plasma/default.nix +++ b/pkgs/desktops/kde-5/plasma/default.nix @@ -13,7 +13,7 @@ let - inherit (pkgs) lib stdenv symlinkJoin; + inherit (pkgs) lib makeSetupHook stdenv symlinkJoin; mirror = "mirror://kde"; srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; }; @@ -24,17 +24,10 @@ let inherit (args) name; sname = args.sname or name; inherit (srcs."${sname}") src version; - in stdenv.mkDerivation (args // { + in kdeDerivation (args // { name = "${name}-${version}"; inherit src; - outputs = args.outputs or [ "dev" "out" ]; - - cmakeFlags = - (args.cmakeFlags or []) - ++ [ "-DBUILD_TESTING=OFF" ] - ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; - meta = { license = with lib.licenses; [ lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 |