diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-06-01 07:50:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-01 07:50:24 +0000 |
| commit | 15d7e7d5456e7fb55c56ec2ad31947567c5044cf (patch) | |
| tree | d2dc5e751aae3c2e85daba3aacc33e8d6aa9f97a /pkgs/applications/graphics/ImageMagick/7.0.nix | |
| parent | 6148edba856c473d3fc46c1cebbc2d70717d441c (diff) | |
| parent | 65e3e9dc51b8c13369f54a484444d6a17e6b9d53 (diff) | |
| download | nixpkgs-15d7e7d5456e7fb55c56ec2ad31947567c5044cf.tar nixpkgs-15d7e7d5456e7fb55c56ec2ad31947567c5044cf.tar.gz nixpkgs-15d7e7d5456e7fb55c56ec2ad31947567c5044cf.tar.bz2 nixpkgs-15d7e7d5456e7fb55c56ec2ad31947567c5044cf.tar.lz nixpkgs-15d7e7d5456e7fb55c56ec2ad31947567c5044cf.tar.xz nixpkgs-15d7e7d5456e7fb55c56ec2ad31947567c5044cf.tar.zst nixpkgs-15d7e7d5456e7fb55c56ec2ad31947567c5044cf.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/graphics/ImageMagick/7.0.nix')
| -rw-r--r-- | pkgs/applications/graphics/ImageMagick/7.0.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 1eb2e4320d6..9c42980c564 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -13,7 +13,7 @@ let else if stdenv.hostPlatform.system == "armv7l-linux" then "armv7l" else if stdenv.hostPlatform.system == "aarch64-linux" || stdenv.hostPlatform.system == "aarch64-darwin" then "aarch64" else if stdenv.hostPlatform.system == "powerpc64le-linux" then "ppc64le" - else throw "ImageMagick is not supported on this platform."; + else null; in stdenv.mkDerivation rec { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-frozenpaths" ] - ++ [ "--with-gcc-arch=${arch}" ] + ++ (if arch != null then [ "--with-gcc-arch=${arch}" ] else [ "--without-gcc-arch" ]) ++ lib.optional (librsvg != null) "--with-rsvg" ++ lib.optionals (ghostscript != null) [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts" |