From ccef701daa49e8b7445876e54ef93c54c68621d7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 11 Mar 2015 09:34:40 -0500
Subject: [PATCH] kdeApps_14_12: set priorities to avoid collisions

---
 pkgs/applications/kde-apps-14.12/default.nix              | 2 ++
 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 0a186567143..555d4d472bc 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 6d96b1b5082..c53ae595e5e 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"];