summary refs log tree commit diff
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2019-02-19 11:10:00 +0100
committerVladimír Čunát <vcunat@gmail.com>2019-02-19 11:10:00 +0100
commit3a078594a138a6b418252fc0a0031bd89187f417 (patch)
tree7bc45fdd9b7c159ac6c5b2954e0ae5017fa8b6ae
parent424efc7e719d411c0b706a7048e45b6cdb315170 (diff)
downloadnixpkgs-3a078594a138a6b418252fc0a0031bd89187f417.tar
nixpkgs-3a078594a138a6b418252fc0a0031bd89187f417.tar.gz
nixpkgs-3a078594a138a6b418252fc0a0031bd89187f417.tar.bz2
nixpkgs-3a078594a138a6b418252fc0a0031bd89187f417.tar.lz
nixpkgs-3a078594a138a6b418252fc0a0031bd89187f417.tar.xz
nixpkgs-3a078594a138a6b418252fc0a0031bd89187f417.tar.zst
nixpkgs-3a078594a138a6b418252fc0a0031bd89187f417.zip
libpng: always apply the debian patches
This fixes the low-severity CVE on other platforms than aarch64.
-rw-r--r--pkgs/development/libraries/libpng/default.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 206472187b0..765f03d9825 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -18,8 +18,7 @@ in stdenv.mkDerivation rec {
     url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz";
     sha256 = "06d35a3xz2a0kph82r56hqm1fn8fbwrqs07xzmr93dx63x695szc";
   };
-  patches = if !stdenv.hostPlatform.isAarch64 then null # temporarily avoid rebuild
-  else [
+  patches = [
     (fetchurl { # https://github.com/glennrp/libpng/issues/266
       url = "https://salsa.debian.org/debian/libpng1.6/raw/0e1348f3d/debian/patches/272.patch";
       sha256 = "1d36khgryq2p27bdx10xrr4kcjr7cdfdj2zhdcjzznpnpns97s6n";