mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
libpng: apply patches from Debian
- first unbreaks ARM builds - second fixes a low-severity CVE These only get applied on aarch64 *for now*, to iterate staging faster.
This commit is contained in:
parent
23191f045d
commit
98be12ab3a
1 changed files with 11 additions and 0 deletions
|
@ -18,6 +18,17 @@ in stdenv.mkDerivation rec {
|
||||||
url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz";
|
url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz";
|
||||||
sha256 = "06d35a3xz2a0kph82r56hqm1fn8fbwrqs07xzmr93dx63x695szc";
|
sha256 = "06d35a3xz2a0kph82r56hqm1fn8fbwrqs07xzmr93dx63x695szc";
|
||||||
};
|
};
|
||||||
|
patches = if !stdenv.hostPlatform.isAarch64 then null # temporarily avoid rebuild
|
||||||
|
else [
|
||||||
|
(fetchurl { # https://github.com/glennrp/libpng/issues/266
|
||||||
|
url = "https://salsa.debian.org/debian/libpng1.6/raw/0e1348f3d/debian/patches/272.patch";
|
||||||
|
sha256 = "1d36khgryq2p27bdx10xrr4kcjr7cdfdj2zhdcjzznpnpns97s6n";
|
||||||
|
})
|
||||||
|
(fetchurl { # https://github.com/glennrp/libpng/issues/275
|
||||||
|
url = "https://salsa.debian.org/debian/libpng1.6/raw/853d1977/debian/patches/CVE-2019-7317.patch";
|
||||||
|
sha256 = "0c8qc176mqh08kcxlnx40rzdggchihkrlzqw6qg6lf0c9ygkf55k";
|
||||||
|
})
|
||||||
|
];
|
||||||
postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1";
|
postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1";
|
||||||
|
|
||||||
outputs = [ "out" "dev" "man" ];
|
outputs = [ "out" "dev" "man" ];
|
||||||
|
|
Loading…
Reference in a new issue