From 3759e4ac86b6a6b03643d3b8522b139403f5e185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?= Date: Fri, 19 Aug 2022 08:00:42 -0300 Subject: [PATCH] ksanecore: init 22.08.0 new dependency of libksane --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/ksanecore.nix | 15 +++++++++++++++ pkgs/applications/kde/libksane.nix | 5 +++-- 4 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/kde/ksanecore.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2a2366c2a536..a5643d3039bb 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -816,6 +816,12 @@ githubId = 7112447; name = "Andre S. Ramos"; }; + andrevmatos = { + email = "andrevmatos@gmail.com"; + github = "andrevmatos"; + githubId = 587021; + name = "André V L Matos"; + }; andrew-d = { email = "andrew@du.nham.ca"; github = "andrew-d"; diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 29bfaecd0a63..8414db45d59a 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -186,6 +186,7 @@ let kreversi = callPackage ./kreversi.nix {}; krfb = callPackage ./krfb.nix {}; kruler = callPackage ./kruler.nix {}; + ksanecore = callPackage ./ksanecore.nix {}; kshisen = callPackage ./kshisen.nix {}; ksmtp = callPackage ./ksmtp {}; kspaceduel = callPackage ./kspaceduel.nix {}; diff --git a/pkgs/applications/kde/ksanecore.nix b/pkgs/applications/kde/ksanecore.nix new file mode 100644 index 000000000000..4ba18ffca1df --- /dev/null +++ b/pkgs/applications/kde/ksanecore.nix @@ -0,0 +1,15 @@ +{ + mkDerivation, lib, + extra-cmake-modules, qtbase, + ki18n, sane-backends +}: + +mkDerivation { + pname = "ksanecore"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtbase ki18n sane-backends ]; + meta = with lib; { + license = licenses.gpl2; + maintainers = with maintainers; [ andrevmatos ]; + }; +} diff --git a/pkgs/applications/kde/libksane.nix b/pkgs/applications/kde/libksane.nix index 79274d4396f4..8dee898412b8 100644 --- a/pkgs/applications/kde/libksane.nix +++ b/pkgs/applications/kde/libksane.nix @@ -2,7 +2,7 @@ mkDerivation, lib, extra-cmake-modules, qtbase, ki18n, ktextwidgets, kwallet, kwidgetsaddons, - sane-backends + ksanecore, sane-backends }: mkDerivation { @@ -12,5 +12,6 @@ mkDerivation { maintainers = with maintainers; [ polendri ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtbase ki18n ktextwidgets kwallet kwidgetsaddons sane-backends ]; + buildInputs = [ qtbase ki18n ktextwidgets kwallet kwidgetsaddons ]; + propagatedBuildInputs = [ ksanecore sane-backends ]; }