kirigami2: 1.90.0 -> 2.1.0

Also use a generic builder.
NixOS · Apr 30, 2017 · 03f939e · 03f939e
1 parent 92f53af
commit 03f939e
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 42 deletions.
diff --git a/pkgs/development/libraries/kirigami/default.nix b/pkgs/development/libraries/kirigami/default.nix
@@ -1,23 +1,47 @@
-{ stdenv, fetchurl, cmake, extra-cmake-modules, pkgconfig, plasma-framework, qtbase, qtquickcontrols }:
+{ stdenv, fetchurl, cmake, extra-cmake-modules, pkgconfig
+, plasma-framework, qtbase
+, qtquickcontrols ? null
+, qtquickcontrols2 ? null }:
 
-stdenv.mkDerivation rec {
+let
   pname = "kirigami";
-  version = "1.1.0";
-  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${name}.tar.xz";
-    sha256 = "1p9ydggwbyfdgwmvyc8004sk9mfshlg9b83lzvz9qk3a906ayxv6";
-  };
+  generic = { name, version, sha256, qtqc, broken }:
+  stdenv.mkDerivation rec {
+    inherit name version;
+
+    src = fetchurl {
+      url = "mirror://kde/stable/${pname}/${name}.tar.xz";
+      inherit sha256;
+    };
+
+    buildInputs = [ plasma-framework qtbase qtqc ];
 
-  buildInputs = [ qtbase qtquickcontrols plasma-framework ];
+    nativeBuildInputs = [ cmake pkgconfig extra-cmake-modules ];
 
-  nativeBuildInputs = [ cmake pkgconfig extra-cmake-modules ];
+    meta = with stdenv.lib; {
+      license     = licenses.lgpl2;
+      homepage    = http://www.kde.org;
+      maintainers = with maintainers; [ ttuegel peterhoeg ];
+      platforms   = platforms.unix;
+      inherit broken;
+    };
+  };
+
+in {
+  kirigami_1 = generic rec {
+    name    = "${pname}-${version}";
+    version = "1.1.0";
+    sha256  = "1p9ydggwbyfdgwmvyc8004sk9mfshlg9b83lzvz9qk3a906ayxv6";
+    qtqc    = qtquickcontrols;
+    broken  = false;
+  };
 
-  meta = with stdenv.lib; {
-    license = licenses.lgpl2;
-    homepage = http://www.kde.org;
-    maintainers = with maintainers; [ ttuegel peterhoeg ];
-    platforms = platforms.unix;
+  kirigami_2 = generic rec {
+    name    = "${pname}2-${version}";
+    version = "2.1.0";
+    sha256  = "0d79h10jzv9z7xzap4k9vbw6p9as8vdkz3x6xlzx407i9sbzyi77";
+    qtqc    = qtquickcontrols2;
+    broken  = builtins.compareVersions qtbase.version "5.7.0" < 0;
   };
 }
diff --git a/pkgs/development/libraries/kirigami/v2.nix b/pkgs/development/libraries/kirigami/v2.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -9601,9 +9601,9 @@ with pkgs;
 
     grantlee = callPackage ../development/libraries/grantlee/5.x.nix { };
 
-    kirigami_1 = callPackage ../development/libraries/kirigami { };
-
-    kirigami_2 = callPackage ../development/libraries/kirigami/v2.nix { };
+    inherit (callPackage ../development/libraries/kirigami { })
+      kirigami_1
+      kirigami_2;
 
     kirigami = kirigami_1;