public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kdeApps_14_12: set priorities to avoid collisions

Browse Source
This commit is contained in:
Thomas Tuegel 2015-03-11 09:34:40 -05:00
parent a25b2b7aa9
commit ccef701daa
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/kde-apps-14.12/default.nix
View File

@ -201,6 +201,7 @@ let
NIX_CFLAGS_COMPILE = NIX_CFLAGS_COMPILE =
(super.kde-runtime.NIX_CFLAGS_COMPILE or "") (super.kde-runtime.NIX_CFLAGS_COMPILE or "")
+ " -I${ilmbase}/include/OpenEXR"; + " -I${ilmbase}/include/OpenEXR";
meta = { priority = 10; };
}; };
kde-workspace = with pkgs; super.kde-workspace // { kde-workspace = with pkgs; super.kde-workspace // {
@ -214,6 +215,7 @@ let
nativeBuildInputs = nativeBuildInputs =
super.kde-workspace.nativeBuildInputs super.kde-workspace.nativeBuildInputs
++ [ pkgconfig ]; ++ [ pkgconfig ];
meta = { priority = 10; };
}; };
kdelibs = with pkgs; super.kdelibs // { kdelibs = with pkgs; super.kdelibs // {

4
pkgs/development/libraries/kde-frameworks-5.7/default.nix
View File

@ -32,7 +32,7 @@ let
] ]
++ optional debug "-DCMAKE_BUILD_TYPE=Debug"; ++ optional debug "-DCMAKE_BUILD_TYPE=Debug";
meta = drv.meta or meta =
{ {
license = with stdenv.lib.licenses; [ license = with stdenv.lib.licenses; [
lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
@ -40,7 +40,7 @@ let
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ ttuegel ]; maintainers = with stdenv.lib.maintainers; [ ttuegel ];
homepage = "http://www.kde.org"; homepage = "http://www.kde.org";
}; } // (drv.meta or {});
}); });
renames = builtins.removeAttrs (import ./renames.nix {}) ["Backend" "CTest"]; renames = builtins.removeAttrs (import ./renames.nix {}) ["Backend" "CTest"];