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

kirigami2: 1.90.0 -> 2.1.0

Browse Source 
Also use a generic builder.
This commit is contained in:
Peter Hoeg 2017-04-30 13:58:08 +08:00
parent 92f53af64d
commit 03f939ebf7
3 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
pkgs/development/libraries/kirigami/default.nix
View File

@ -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 ];
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;
};
};
buildInputs = [ qtbase qtquickcontrols plasma-framework ];
in {
kirigami_1 = generic rec {
name = "${pname}-${version}";
version = "1.1.0";
sha256 = "1p9ydggwbyfdgwmvyc8004sk9mfshlg9b83lzvz9qk3a906ayxv6";
qtqc = qtquickcontrols;
broken = false;
};
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;
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;
};
}

24
pkgs/development/libraries/kirigami/v2.nix
View File

@ -1,24 +0,0 @@
{ stdenv, fetchurl, cmake, extra-cmake-modules, pkgconfig, plasma-framework, qtbase, qtquickcontrols2 }:
stdenv.mkDerivation rec {
pname = "kirigami";
version = "1.90.0";
name = "${pname}2-${version}";
src = fetchurl {
url = "mirror://kde/unstable/${pname}/${pname}-${version}.tar.xz";
sha256 = "a5ca094a60d1cc48116cbed07bbe68be016773d2488a91e278859c90f59e64a8";
};
buildInputs = [ qtbase qtquickcontrols2 plasma-framework ];
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;
broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
};
}

6
pkgs/top-level/all-packages.nix
View File

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