Merge branch 'kde5'

2015-03-11 11:49:45 -05:00
parent 798e613e16 f370af91ad
commit 61cf7e1265
6 changed files with 1911 additions and 8 deletions
--- 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"];