dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions1 Packages Projects Releases Wiki Activity

imagemagick: fix evaluation on mingw

Browse Source 
I made a mistake during conflict resolution in 7a005601d.
This commit is contained in:
Vladimír Čunát 2016-05-10 18:06:01 +02:00
parent 1d487057e2
commit 292fb98d96
1 changed files with 2 additions and 2 deletions

4
pkgs/applications/graphics/ImageMagick/default.nix
View File

@ -19,12 +19,12 @@ let
// lib.optionalAttrs (stdenv.cross.libc or null == "msvcrt") { // lib.optionalAttrs (stdenv.cross.libc or null == "msvcrt") {
version = "6.9.2-0"; version = "6.9.2-0";
sha256 = "17ir8bw1j7g7srqmsz3rx780sgnc21zfn0kwyj78iazrywldx8h7"; sha256 = "17ir8bw1j7g7srqmsz3rx780sgnc21zfn0kwyj78iazrywldx8h7";
patches = (fetchpatch { patches = [(fetchpatch {
name = "mingw-build.patch"; name = "mingw-build.patch";
url = "https://raw.githubusercontent.com/Alexpux/MINGW-packages/" url = "https://raw.githubusercontent.com/Alexpux/MINGW-packages/"
+ "01ca03b2a4ef/mingw-w64-imagemagick/002-build-fixes.patch"; + "01ca03b2a4ef/mingw-w64-imagemagick/002-build-fixes.patch";
sha256 = "1pypszlcx2sf7wfi4p37w1y58ck2r8cd5b2wrrwr9rh87p7fy1c0"; sha256 = "1pypszlcx2sf7wfi4p37w1y58ck2r8cd5b2wrrwr9rh87p7fy1c0";
}); })];
}; };
in in