nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-26 10:30:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #268930 from NixOS/backport-268821-to-release-23.05

Browse Source 
[Backport release-23.05] optipng: 0.7.7 -> 0.7.8
This commit is contained in:
Nick Cao
2023-11-21 18:21:11 -05:00
committed by GitHub
parent 767986a427 3a1d05c1df
commit f836f37124
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/graphics/optipng/default.nix
View File

@@ -6,22 +6,26 @@
stdenv.mkDerivation rec {
pname = "optipng";
version = "0.7.7";
version = "0.7.8";
src = fetchurl {
url = "mirror://sourceforge/optipng/optipng-${version}.tar.gz";
sha256 = "0lj4clb851fzpaq446wgj0sfy922zs5l5misbpwv6w7qrqrz4cjg";
hash = "sha256-JaO9aEgfIVAsyqD0wT+E3PayAzjkxOjFHyzvvYUTOYw=";
};
buildInputs = [ libpng ];
LDFLAGS = lib.optional static "-static";
# Workaround for crash in cexcept.h. See
# https://github.com/NixOS/nixpkgs/issues/28106
preConfigure = ''
export LD=$CC
'';
# OptiPNG does not like --static, --build or --host
dontDisableStatic = true;
dontAddStaticConfigureFlags = true;
configurePlatforms = [ ];
configureFlags = [
"--with-system-zlib"
"--with-system-libpng"

4
pkgs/top-level/all-packages.nix
View File

@@ -10964,9 +10964,7 @@ with pkgs;
optifine = optifinePackages.optifine-latest;
optipng = callPackage ../tools/graphics/optipng {
libpng = libpng12;
};
optipng = callPackage ../tools/graphics/optipng { };
olsrd = callPackage ../tools/networking/olsrd { };