Merge pull request #29060 from pshendry/master

skanlite: init at 2.0.1
This commit is contained in:
Peter Hoeg 2017-09-17 12:05:11 +08:00 committed by GitHub
commit 43d0317d11
5 changed files with 54 additions and 1 deletions

View File

@ -135,6 +135,7 @@ let
libkipi = callPackage ./libkipi.nix {};
libkleo = callPackage ./libkleo.nix {};
libkomparediff2 = callPackage ./libkomparediff2.nix {};
libksane = callPackage ./libksane.nix {};
libksieve = callPackage ./libksieve.nix {};
mailcommon = callPackage ./mailcommon.nix {};
mailimporter = callPackage ./mailimporter.nix {};

View File

@ -0,0 +1,16 @@
{
mkDerivation, lib,
extra-cmake-modules, qtbase,
ki18n, ktextwidgets, kwallet, kwidgetsaddons,
sane-backends
}:
mkDerivation {
name = "libksane";
meta = with lib; {
license = licenses.gpl2;
maintainers = with maintainers; [ pshendry ];
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtbase ki18n ktextwidgets kwallet kwidgetsaddons sane-backends ];
}

View File

@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "KDE integrated BtTorrent client";
homepage = https://www.kde.org/applications/internet/ktorrent/;
license = licenses.gpl2;
maintainers = with maintainers; [ eelco ];
platforms = platforms.linux;
};

View File

@ -0,0 +1,33 @@
{ stdenv, fetchurl, cmake, extra-cmake-modules, qtbase,
kcoreaddons, kdoctools, ki18n, kio, kxmlgui, ktextwidgets,
libksane
}:
let
minorVersion = "2.0";
in stdenv.mkDerivation rec {
name = "skanlite-2.0.1";
src = fetchurl {
url = "mirror://kde/stable/skanlite/${minorVersion}/${name}.tar.xz";
sha256 = "0dh2v8029gkhcf3pndcxz1zk2jgpihgd30lmplgirilxdq9l2i9v";
};
nativeBuildInputs = [ cmake kdoctools extra-cmake-modules ];
buildInputs = [
qtbase
kcoreaddons kdoctools ki18n kio kxmlgui ktextwidgets
libksane
];
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "KDE simple image scanning application";
homepage = http://www.kde.org/applications/graphics/skanlite/;
license = licenses.gpl2;
maintainers = with maintainers; [ pshendry ];
platforms = platforms.linux;
};
}

View File

@ -10146,7 +10146,7 @@ with pkgs;
### KDE APPLICATIONS
inherit (kdeApplications.override { libsForQt5 = self; })
kholidays libkdcraw libkexiv2 libkipi libkomparediff2;
kholidays libkdcraw libkexiv2 libkipi libkomparediff2 libksane;
### LIBRARIES
@ -16267,6 +16267,8 @@ with pkgs;
sipp = callPackage ../development/tools/misc/sipp { };
skanlite = libsForQt5.callPackage ../applications/office/skanlite { };
sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser {
inherit (pkgs.vamp) vampSDK;
};