diff options
| author | Kerstin Humm <kerstin@erictapen.name> | 2022-03-26 17:15:17 +0100 |
|---|---|---|
| committer | Kerstin Humm <kerstin@erictapen.name> | 2022-03-30 18:47:25 +0200 |
| commit | 0cd73588690f10c53e1b5e13fda4e0708bf44d9f (patch) | |
| tree | e33a7c34a88536429b0efc2a18a44437482be1df /pkgs/applications/graphics | |
| parent | bb22a2debcbb2695a4eb1be9b319952f17cfefb2 (diff) | |
| download | nixpkgs-0cd73588690f10c53e1b5e13fda4e0708bf44d9f.tar nixpkgs-0cd73588690f10c53e1b5e13fda4e0708bf44d9f.tar.gz nixpkgs-0cd73588690f10c53e1b5e13fda4e0708bf44d9f.tar.bz2 nixpkgs-0cd73588690f10c53e1b5e13fda4e0708bf44d9f.tar.lz nixpkgs-0cd73588690f10c53e1b5e13fda4e0708bf44d9f.tar.xz nixpkgs-0cd73588690f10c53e1b5e13fda4e0708bf44d9f.tar.zst nixpkgs-0cd73588690f10c53e1b5e13fda4e0708bf44d9f.zip | |
imagemagick: use libjxl on aarch64-linux, as it builds now for that target
Works since f24cab5396085e138ff82d53888af8a9a7d83055
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/ImageMagick/7.0.nix | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 7a8cae9bf81..523903c53ab 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -64,9 +64,7 @@ stdenv.mkDerivation rec { ++ (if arch != null then [ "--with-gcc-arch=${arch}" ] else [ "--without-gcc-arch" ]) ++ lib.optional (librsvg != null) "--with-rsvg" ++ lib.optional (liblqr1 != null) "--with-lqr" - # libjxl is broken on aarch64 (see meta.broken in libjxl) for now, - # let's disable it for now to unbreak the imagemagick build. - ++ lib.optional (libjxl != null && !stdenv.isAarch64) "--with-jxl" + ++ lib.optional (libjxl != null ) "--with-jxl" ++ lib.optionals (ghostscript != null) [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts" @@ -92,11 +90,8 @@ stdenv.mkDerivation rec { libxml2 libheif djvulibre + libjxl ] - # libjxl is broken on aarch64 (see meta.broken in libjxl) for now, - # let's disable it for now to unbreak the imagemagick build. - ++ lib.optionals (!stdenv.isAarch64) - [ libjxl ] ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ openexr librsvg openjpeg ] ++ lib.optionals stdenv.isDarwin [ |