summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Heß <janne@hess.ooo>2022-05-23 11:01:21 +0200
committerGitHub <noreply@github.com>2022-05-23 11:01:21 +0200
commit09438ed9cefd20ae59fb1bc386fd78a9484afccd (patch)
treeb5f109791ea6ea0db7a4052647bc1a6f7d80cf20
parent137b8e2781770af0ceabac6086c8f48e90bcbb62 (diff)
parent6e17b6945c7224b73f21ec0f390120ba3432978d (diff)
Merge pull request #173968 from symphorien/scantailor-advanced-zhf
scantailor-advanced: fix build with qt5.15 by switching to a maintained fork
-rw-r--r--pkgs/applications/graphics/scantailor/advanced.nix10
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix
index 048b8b56fc08..11ddc7c7db3f 100644
--- a/pkgs/applications/graphics/scantailor/advanced.nix
+++ b/pkgs/applications/graphics/scantailor/advanced.nix
@@ -4,21 +4,21 @@
mkDerivation rec {
pname = "scantailor-advanced";
- version = "1.0.16";
+ version = "1.0.18";
src = fetchFromGitHub {
- owner = "4lex4";
+ owner = "vigri";
repo = "scantailor-advanced";
rev = "v${version}";
- sha256 = "0lc9lzbpiy5hgimyhl4s4q67pb9gacpy985gl6iy8pl79zxhmcyp";
+ sha256 = "sha256-4/QSjgHvRgIduS/AXbT7osRTdOdgR7On3CbjRnGbwHU=";
};
nativeBuildInputs = [ cmake qttools ];
buildInputs = [ libjpeg libpng libtiff boost qtbase ];
meta = with lib; {
- homepage = "https://github.com/4lex4/scantailor-advanced";
- description = "Interactive post-processing tool for scanned pages";
+ homepage = "https://github.com/vigri/scantailor-advanced";
+ description = "Interactive post-processing tool for scanned pages (vigri's fork)";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ jfrankenau ];
platforms = with platforms; gnu ++ linux ++ darwin;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e50917ea399a..f46e86606e3a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -29385,7 +29385,7 @@ with pkgs;
scantailor = callPackage ../applications/graphics/scantailor { };
- scantailor-advanced = libsForQt514.callPackage ../applications/graphics/scantailor/advanced.nix { };
+ scantailor-advanced = libsForQt515.callPackage ../applications/graphics/scantailor/advanced.nix { };
sc-im = callPackage ../applications/misc/sc-im { };