diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-08-17 18:34:17 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-08-17 18:34:17 +0200 |
| commit | 8f2ea38f8fda5876cfaf963097b9fe709159f3ff (patch) | |
| tree | 5b5e304fec50ede4c46c475c9ed1d0414e54ab6b /pkgs/tools/graphics | |
| parent | 9289365627ce6b82d9ec2f3029e82aa8fc93e655 (diff) | |
| parent | 31eea73f994b8cca50d3f88d6a4fadd98e09e798 (diff) | |
| download | nixlib-8f2ea38f8fda5876cfaf963097b9fe709159f3ff.tar nixlib-8f2ea38f8fda5876cfaf963097b9fe709159f3ff.tar.gz nixlib-8f2ea38f8fda5876cfaf963097b9fe709159f3ff.tar.bz2 nixlib-8f2ea38f8fda5876cfaf963097b9fe709159f3ff.tar.lz nixlib-8f2ea38f8fda5876cfaf963097b9fe709159f3ff.tar.xz nixlib-8f2ea38f8fda5876cfaf963097b9fe709159f3ff.tar.zst nixlib-8f2ea38f8fda5876cfaf963097b9fe709159f3ff.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/tools/graphics')
| -rw-r--r-- | pkgs/tools/graphics/maim/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/graphics/optipng/default.nix | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix index 3d278cbce6fb..aaf7b68d177f 100644 --- a/pkgs/tools/graphics/maim/default.nix +++ b/pkgs/tools/graphics/maim/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "maim-${version}"; - version = "5.4.67"; + version = "5.4.68"; src = fetchFromGitHub { owner = "naelstrof"; repo = "maim"; rev = "v${version}"; - sha256 = "1p72pkfnzhxxmlnryjyvgr6cgjm5ww10xr35si9mx9s4b9pz38jd"; + sha256 = "12jvfxzfhh6cbk6ygliwnkvm3mb7rca60k6x9qdzm17jsz65xhh0"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/tools/graphics/optipng/default.nix index 471e8ee8df47..f9b82a38344e 100644 --- a/pkgs/tools/graphics/optipng/default.nix +++ b/pkgs/tools/graphics/optipng/default.nix @@ -17,6 +17,12 @@ stdenv.mkDerivation rec { buildInputs = [ libpng ]; LDFLAGS = optional static "-static"; + # Workaround for crash in cexcept.h. See + # https://github.com/NixOS/nixpkgs/issues/28106 + preConfigure = '' + export LD=$CC + ''; + configureFlags = [ "--with-system-zlib" "--with-system-libpng" |