diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 9bfe71e196e..27b702e370e 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -216,6 +216,7 @@ let pim-sieve-editor = callPackage ./pim-sieve-editor.nix {}; print-manager = callPackage ./print-manager.nix {}; rocs = callPackage ./rocs.nix {}; + skanlite = callPackage ./skanlite.nix {}; spectacle = callPackage ./spectacle.nix {}; yakuake = callPackage ./yakuake.nix {}; }; diff --git a/pkgs/applications/kde/skanlite.nix b/pkgs/applications/kde/skanlite.nix new file mode 100644 index 00000000000..30ceba645b7 --- /dev/null +++ b/pkgs/applications/kde/skanlite.nix @@ -0,0 +1,18 @@ +{ + mkDerivation, lib, + extra-cmake-modules, kdoctools, + kio, libksane +}: + +mkDerivation { + pname = "skanlite"; + meta = with lib; { + description = "KDE simple image scanning application"; + homepage = "https://apps.kde.org/skanlite"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ polendri ]; + }; + + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ kio libksane ]; +} diff --git a/pkgs/applications/office/skanlite/default.nix b/pkgs/applications/office/skanlite/default.nix deleted file mode 100644 index 6cdbea75598..00000000000 --- a/pkgs/applications/office/skanlite/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, mkDerivation, fetchurl, cmake, extra-cmake-modules, qtbase, - kcoreaddons, kdoctools, ki18n, kio, kxmlgui, ktextwidgets, - libksane -}: - -mkDerivation rec { - pname = "skanlite"; - version = "2.2.0"; - - src = fetchurl { - url = "mirror://kde/stable/skanlite/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "VP7MOZdUe64XIVr3r0aKIl1IPds3vjBTZzOS3N3VhOQ="; - }; - - nativeBuildInputs = [ cmake kdoctools extra-cmake-modules ]; - - buildInputs = [ - qtbase - kcoreaddons kdoctools ki18n kio kxmlgui ktextwidgets - libksane - ]; - - meta = with lib; { - description = "KDE simple image scanning application"; - homepage = "https://apps.kde.org/skanlite"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ polendri ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 46371603fda..c4583f83bff 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1432,7 +1432,7 @@ mapAliases ({ plasma-integration plasma-nano plasma-nm plasma-pa plasma-phone-components plasma-systemmonitor plasma-thunderbolt plasma-vault plasma-workspace plasma-workspace-wallpapers polkit-kde-agent powerdevil qqc2-breeze-style - sddm-kcm spectacle systemsettings xdg-desktop-portal-kde yakuake + sddm-kcm skanlite spectacle systemsettings xdg-desktop-portal-kde yakuake ; inherit (plasma5Packages.thirdParty) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a29312d19b3..9e5104945cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28904,8 +28904,6 @@ with pkgs; sipp = callPackage ../development/tools/misc/sipp { }; - skanlite = libsForQt5.callPackage ../applications/office/skanlite { }; - soci = callPackage ../development/libraries/soci { }; socialscan = with python3.pkgs; toPythonApplication socialscan;