colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

cross: graphicsmagick: push patch upstream

Browse Source
This commit is contained in:
Colin
2024-02-27 23:46:05 +00:00
parent 6ef729bbaf
commit 6b2d189771
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
nixpatches/list.nix
View File

@@ -38,6 +38,13 @@ in [
hash = "sha256-cC9GBF5tCeJ2GDSjMjlG4hYStIJPEoRBAK9/KhJiiIo="; hash = "sha256-cC9GBF5tCeJ2GDSjMjlG4hYStIJPEoRBAK9/KhJiiIo=";
}) })
(fetchpatch' {
# this forces an expensive rebuild, mostly just to reduce moby's closure by 40 MiB (if even)
prUrl = "https://github.com/NixOS/nixpkgs/pull/291942";
title = "imagemagick, graphicsmagick: remove build coreutils from cross-compiled output";
hash = "sha256-jUtMmT4d+/6hZgrpXhfBcToAfdecl7xtEj1d/ofxaIM=";
})
# (fetchpatch' { # (fetchpatch' {
# title = "nixos/slskd: allow omitting username from yaml config"; # title = "nixos/slskd: allow omitting username from yaml config";
# saneCommit = "541c37e8689b6422ea07be1395f1a63357bb0c63"; # saneCommit = "541c37e8689b6422ea07be1395f1a63357bb0c63";

16
overlays/cross.nix
View File

@@ -1021,13 +1021,15 @@ in with final; {
}); });
# 2024/02/27: upstreaming is unblocked # 2024/02/27: upstreaming is unblocked
graphicsmagick = prev.graphicsmagick.overrideAttrs (upstream: { # this patch isn't strictly necessary: it mostly just removes build tools from the runtime closure
# by default the build holds onto a reference to build `mv` # out for PR: <https://github.com/NixOS/nixpkgs/pull/291942>
# N.B.: `imagemagick` package has this identical issue (but requires a different fix?) # graphicsmagick = prev.graphicsmagick.overrideAttrs (upstream: {
configureFlags = upstream.configureFlags ++ [ # # by default the build holds onto a reference to build `mv`
"MVDelegate=${coreutils}/bin/mv" # # N.B.: `imagemagick` package has this identical issue (but requires a different fix?)
]; # configureFlags = upstream.configureFlags ++ [
}); # "MVDelegate=${coreutils}/bin/mv"
# ];
# });
# fixes: "make: gcc: No such file or directory" # fixes: "make: gcc: No such file or directory"
# java-service-wrapper = useEmulatedStdenv prev.java-service-wrapper; # java-service-wrapper = useEmulatedStdenv prev.java-service-wrapper;