diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2015-03-11 09:34:40 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-03-11 09:34:40 -0500 |
commit | ccef701daa49e8b7445876e54ef93c54c68621d7 (patch) | |
tree | c80e269fa6180968ed46f510418486fbac829af6 | |
parent | a25b2b7aa9e3e324ba9a113b7ed93a0f9db8ccb8 (diff) | |
download | nixlib-ccef701daa49e8b7445876e54ef93c54c68621d7.tar nixlib-ccef701daa49e8b7445876e54ef93c54c68621d7.tar.gz nixlib-ccef701daa49e8b7445876e54ef93c54c68621d7.tar.bz2 nixlib-ccef701daa49e8b7445876e54ef93c54c68621d7.tar.lz nixlib-ccef701daa49e8b7445876e54ef93c54c68621d7.tar.xz nixlib-ccef701daa49e8b7445876e54ef93c54c68621d7.tar.zst nixlib-ccef701daa49e8b7445876e54ef93c54c68621d7.zip |
kdeApps_14_12: set priorities to avoid collisions
-rw-r--r-- | pkgs/applications/kde-apps-14.12/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks-5.7/default.nix | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/kde-apps-14.12/default.nix b/pkgs/applications/kde-apps-14.12/default.nix index 0a1865671433..555d4d472bcc 100644 --- a/pkgs/applications/kde-apps-14.12/default.nix +++ b/pkgs/applications/kde-apps-14.12/default.nix @@ -201,6 +201,7 @@ let NIX_CFLAGS_COMPILE = (super.kde-runtime.NIX_CFLAGS_COMPILE or "") + " -I${ilmbase}/include/OpenEXR"; + meta = { priority = 10; }; }; kde-workspace = with pkgs; super.kde-workspace // { @@ -214,6 +215,7 @@ let nativeBuildInputs = super.kde-workspace.nativeBuildInputs ++ [ pkgconfig ]; + meta = { priority = 10; }; }; kdelibs = with pkgs; super.kdelibs // { diff --git a/pkgs/development/libraries/kde-frameworks-5.7/default.nix b/pkgs/development/libraries/kde-frameworks-5.7/default.nix index 6d96b1b50820..c53ae595e5e2 100644 --- a/pkgs/development/libraries/kde-frameworks-5.7/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.7/default.nix @@ -32,7 +32,7 @@ let ] ++ optional debug "-DCMAKE_BUILD_TYPE=Debug"; - meta = drv.meta or + meta = { license = with stdenv.lib.licenses; [ lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 @@ -40,7 +40,7 @@ let platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ ttuegel ]; homepage = "http://www.kde.org"; - }; + } // (drv.meta or {}); }); renames = builtins.removeAttrs (import ./renames.nix {}) ["Backend" "CTest"]; |