cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #270223 from Stunkymonkey/xsane-remove-override-libpng

Browse source 
xsane: remove override libpng
This commit is contained in:
Felix Bühler 2023-11-29 19:40:28 +01:00 committed by GitHub
commit 0eb1ee9fdb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/graphics/sane/xsane.nix
View file

@ -11,6 +11,7 @@
, gimpSupport ? false
, gimp
, nix-update-script
, fetchpatch
}:
stdenv.mkDerivation rec {
@ -25,6 +26,13 @@ stdenv.mkDerivation rec {
hash = "sha256-oOg94nUsT9LLKnHocY0S5g02Y9a1UazzZAjpEI/s+yM=";
};
patches = [
(fetchpatch {
url = "https://src.fedoraproject.org/rpms/xsane/raw/rawhide/f/xsane-0.998-libpng.patch";
hash = "sha256-0z292+Waa2g0PCQpUebdWprl9VDyBOY0XgqMJaIcRb8=";
})
];
preConfigure = ''
sed -e '/SANE_CAP_ALWAYS_SETTABLE/d' -i src/xsane-back-gtk.c
chmod a+rX -R .

5
pkgs/top-level/all-packages.nix
View file

@ -41530,10 +41530,7 @@ with pkgs;
xpad = callPackage ../applications/misc/xpad { };
xsane = callPackage ../applications/graphics/sane/xsane.nix {
libpng = libpng12;
sane-backends = sane-backends.override { libpng = libpng12; };
};
xsane = callPackage ../applications/graphics/sane/xsane.nix { };
xsser = python3Packages.callPackage ../tools/security/xsser { };