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/development/libraries | |
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/development/libraries')
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/default.nix | 29 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix | 16 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/setup-hook.sh (renamed from pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh) | 0 |
3 files changed, 31 insertions, 14 deletions
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index bff2b394038b..94e8f5db3b77 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -19,13 +19,14 @@ let srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; }; packages = self: with self; { - kdeFramework = args: + + kdeDerivation = args: let - inherit (args) name; - inherit (srcs."${name}") src version; + setupHook = + let drv = { qtbase, qttools }: + makeSetupHook { deps = [ qtbase qttools ]; } ./setup-hook.sh; + in callPackage drv {}; in stdenv.mkDerivation (args // { - name = "${name}-${version}"; - inherit src; outputs = args.outputs or [ "dev" "out" ]; @@ -34,6 +35,20 @@ let ++ [ "-DBUILD_TESTING=OFF" ] ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; + nativeBuildInputs = + (args.nativeBuildInputs or []) + ++ [ pkgs.cmake pkgs.pkgconfig setupHook ]; + + }); + + kdeFramework = args: + let + inherit (args) name; + inherit (srcs."${name}") src version; + in kdeDerivation (args // { + name = "${name}-${version}"; + inherit src; + meta = { license = with lib.licenses; [ lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 @@ -47,7 +62,9 @@ let baloo = callPackage ./baloo.nix {}; bluez-qt = callPackage ./bluez-qt.nix {}; breeze-icons = callPackage ./breeze-icons.nix {}; - extra-cmake-modules = callPackage ./extra-cmake-modules {}; + extra-cmake-modules = callPackage ./extra-cmake-modules { + inherit (srcs.extra-cmake-modules) src version; + }; frameworkintegration = callPackage ./frameworkintegration.nix {}; kactivities = callPackage ./kactivities.nix {}; kactivities-stats = callPackage ./kactivities-stats.nix {}; diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix index 1c2ea70442d3..d2f1688e330b 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix @@ -1,19 +1,19 @@ -{ kdeFramework, lib, copyPathsToStore, cmake, pkgconfig, qttools }: +{ stdenv, lib, copyPathsToStore, src, version, cmake }: -kdeFramework { - name = "extra-cmake-modules"; +stdenv.mkDerivation { + name = "extra-cmake-modules-${version}"; + + inherit src; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); outputs = [ "out" ]; # this package has no runtime components - setupHook = ./setup-hook.sh; - # It is OK to propagate these inputs as long as - # extra-cmake-modules is never a propagated input - # of some other derivation. - propagatedNativeBuildInputs = [ cmake pkgconfig qttools ]; + nativeBuildInputs = [ cmake ]; meta = with lib; { + platforms = lib.platforms.linux; + homepage = "http://www.kde.org"; license = licenses.bsd2; maintainers = [ maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/setup-hook.sh index 5363f4e30fdc..5363f4e30fdc 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh +++ b/pkgs/development/libraries/kde-frameworks/setup-hook.sh |