From b7d90c3b6debb0a6b0114e5492716bc22bacc839 Mon Sep 17 00:00:00 2001 From: Colin Date: Thu, 12 Oct 2023 01:11:27 +0000 Subject: [PATCH] cross: graphicsmagick: remove reference to build coreutils --- nixpatches/list.nix | 5 +++++ overlays/cross.nix | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/nixpatches/list.nix b/nixpatches/list.nix index 3e288116..e9557dc1 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -31,6 +31,11 @@ in [ hash = "sha256-FDY/OLh7bNRixEuPlrIeyW/kJYNPnelLsplfKCsjHKQ="; }) # (fetchpatch' { + # title = "graphicsmagick: 1.3.39 -> 1.3.42"; + # prUrl = "https://github.com/NixOS/nixpkgs/pull/218163"; + # hash = "sha256-E1Xfi7BRpAvqAzfChjWRG1Ar5dsFMm/yu7NXnDc95PM="; + # }) + # (fetchpatch' { # # disabled, at least until the PR is updated to use `pkg-config` instead of `pkgconfig`. # # the latter is an alias, which breaks nix-index # title = "phog: init at 0.1.3"; diff --git a/overlays/cross.nix b/overlays/cross.nix index 4dc6d796..6abad1a4 100644 --- a/overlays/cross.nix +++ b/overlays/cross.nix @@ -905,6 +905,14 @@ in { # buildPackages.gtk-doc = final.gtk-doc; # }); + graphicsmagick = prev.graphicsmagick.overrideAttrs (upstream: { + # by default the build holds onto a reference to build `mv` + # N.B.: `imagemagick` package has this identical issue + configureFlags = upstream.configureFlags ++ [ + "MVDelegate=${final.coreutils}/bin/mv" + ]; + }); + # fixes: "make: gcc: No such file or directory" # java-service-wrapper = useEmulatedStdenv prev.java-service-wrapper;