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

nixpatches: imagemagick closure fix: mark as merged upstream

Browse Source
This commit is contained in:
Colin
2024-02-28 18:27:02 +00:00
parent 7c22b59b9d
commit bd4eeeeb3b
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nixpatches/list.nix
View File

@@ -26,6 +26,11 @@ let
// (if title != null then { name = title; } else {}) // (if title != null then { name = title; } else {})
) else null; ) else null;
in [ in [
# if a patch has been merged, use
# merged.staging = "<date>";
# merged.master = "<date>";
# etc, where "date" is like "20240228181608"
# and can be found with `nix-repl > :lf . > lastModifiedDate`
(fetchpatch' { (fetchpatch' {
prUrl = "https://github.com/NixOS/nixpkgs/pull/291806"; prUrl = "https://github.com/NixOS/nixpkgs/pull/291806";
title = "swaynotificationcenter: support cross compilation"; title = "swaynotificationcenter: support cross compilation";
@@ -43,6 +48,7 @@ in [
prUrl = "https://github.com/NixOS/nixpkgs/pull/291942"; prUrl = "https://github.com/NixOS/nixpkgs/pull/291942";
title = "imagemagick, graphicsmagick: remove build coreutils from cross-compiled output"; title = "imagemagick, graphicsmagick: remove build coreutils from cross-compiled output";
hash = "sha256-jUtMmT4d+/6hZgrpXhfBcToAfdecl7xtEj1d/ofxaIM="; hash = "sha256-jUtMmT4d+/6hZgrpXhfBcToAfdecl7xtEj1d/ofxaIM=";
merged.staging = "20240228181608";
}) })
(fetchpatch' { (fetchpatch' {
prUrl = "https://github.com/NixOS/nixpkgs/pull/291947"; prUrl = "https://github.com/NixOS/nixpkgs/pull/291947";

11
overlays/cross.nix
View File

@@ -1021,17 +1021,6 @@ in with final; {
''; '';
}); });
# 2024/02/27: upstreaming is unblocked
# this patch isn't strictly necessary: it mostly just removes build tools from the runtime closure
# out for PR: <https://github.com/NixOS/nixpkgs/pull/291942>
# graphicsmagick = prev.graphicsmagick.overrideAttrs (upstream: {
# # by default the build holds onto a reference to build `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;