diff options
| author | Peter Hoeg <peter@speartail.com> | 2016-10-17 17:32:05 +0800 |
|---|---|---|
| committer | Peter Hoeg <peter@speartail.com> | 2016-10-17 20:50:12 +0800 |
| commit | 2a4098d74c10491159ff407735f34221b5caa75d (patch) | |
| tree | 2a0b604a1d3fe61fede259c4b3cb64f0466b75b5 /pkgs | |
| parent | 09e4b78b48fa9b5da00f44d2c01f0f9f16c3d406 (diff) | |
| download | nixpkgs-2a4098d74c10491159ff407735f34221b5caa75d.tar nixpkgs-2a4098d74c10491159ff407735f34221b5caa75d.tar.gz nixpkgs-2a4098d74c10491159ff407735f34221b5caa75d.tar.bz2 nixpkgs-2a4098d74c10491159ff407735f34221b5caa75d.tar.lz nixpkgs-2a4098d74c10491159ff407735f34221b5caa75d.tar.xz nixpkgs-2a4098d74c10491159ff407735f34221b5caa75d.tar.zst nixpkgs-2a4098d74c10491159ff407735f34221b5caa75d.zip | |
peruse: init at 1.1
Includes kirigami at 1.1.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/kirigami/default.nix | 23 | ||||
| -rw-r--r-- | pkgs/tools/misc/peruse/default.nix | 42 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 69 insertions, 0 deletions
diff --git a/pkgs/development/libraries/kirigami/default.nix b/pkgs/development/libraries/kirigami/default.nix new file mode 100644 index 00000000000..0fd80d7fa53 --- /dev/null +++ b/pkgs/development/libraries/kirigami/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, cmake, ecm, pkgconfig, plasma-framework, qtbase, qtquickcontrols }: + +stdenv.mkDerivation rec { + pname = "kirigami"; + version = "1.1.0"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://kde/stable/${pname}/${name}.tar.xz"; + sha256 = "1p9ydggwbyfdgwmvyc8004sk9mfshlg9b83lzvz9qk3a906ayxv6"; + }; + + buildInputs = [ qtbase qtquickcontrols plasma-framework ]; + + nativeBuildInputs = [ cmake pkgconfig ecm ]; + + meta = with stdenv.lib; { + license = licenses.lgpl2; + homepage = http://www.kde.org; + maintainers = with maintainers; [ ttuegel peterhoeg ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/peruse/default.nix b/pkgs/tools/misc/peruse/default.nix new file mode 100644 index 00000000000..865c6b1e842 --- /dev/null +++ b/pkgs/tools/misc/peruse/default.nix @@ -0,0 +1,42 @@ +{ + kdeDerivation, kdeWrapper, fetchFromGitHub, fetchurl, lib, + ecm, kdoctools, + baloo, kconfig, kfilemetadata, kinit, kirigami, plasma-framework +}: + +let + pname = "peruse"; + version = "1.1"; + unarr = fetchFromGitHub { + owner = "zeniko"; + repo = "unarr"; + rev = "d1be8c43a82a4320306c8e835a86fdb7b2574ca7"; + sha256 = "03ds5da69zipa25rsp76l6xqivrh3wcgygwyqa5x2rgcz3rjnlpr"; + }; + unwrapped = kdeDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://kde/stable/${pname}/${name}.tar.xz"; + sha256 = "1akk9hg12y6iis0rb5kdkznm3xk7hk04r9ccqyz8lr6y073n5f9j"; + }; + + nativeBuildInputs = [ ecm kdoctools ]; + + propagatedBuildInputs = [ baloo kconfig kfilemetadata kinit kirigami plasma-framework ]; + + preConfigure = '' + rmdir src/qtquick/karchive-rar/external/unarr + ln -s ${unarr} src/qtquick/karchive-rar/external/unarr + ''; + + meta = with lib; { + license = licenses.gpl2; + maintainers = with maintainers; [ peterhoeg ]; + }; + + }; + +in kdeWrapper unwrapped { + targets = [ "bin/peruse" ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9450ef9915e..16fd7e5cbed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2298,6 +2298,8 @@ in kronometer = qt5.callPackage ../tools/misc/kronometer { }; + peruse = qt5.callPackage ../tools/misc/peruse { }; + kst = qt5.callPackage ../tools/graphics/kst { gsl = gsl_1; }; kytea = callPackage ../tools/text/kytea { }; @@ -8833,6 +8835,8 @@ in grantlee = callPackage ../development/libraries/grantlee/5.x.nix { }; + kirigami = callPackage ../development/libraries/kirigami { }; + libcommuni = callPackage ../development/libraries/libcommuni { }; libdbusmenu = callPackage ../development/libraries/libdbusmenu-qt/qt-5.5.nix { }; |