kdeApps_14_12: set priorities to avoid collisions

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

View file

@ -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 // {

View file

@ -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"];