Merge pull request #19621 from peterhoeg/peruse

peruse: init at 1.1
This commit is contained in:
Thomas Tuegel 2016-10-17 09:17:38 -05:00 committed by GitHub
commit 953fd050c0
3 changed files with 69 additions and 0 deletions

View file

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

View file

@ -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" ];
}

View file

@ -2300,6 +2300,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 { };
@ -8837,6 +8839,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 { };