diff --git a/nixpatches/list.nix b/nixpatches/list.nix index b174e5c39..940929fdd 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -26,6 +26,12 @@ let // (if title != null then { name = title; } else {}) ) else null; in [ + (fetchpatch' { + title = "argyllcms: support cross compilation"; + prUrl = "https://github.com/NixOS/nixpkgs/pull/275755"; + saneCommit = "8114d5dabbf5f4f1e8c370b889d4f2986b63998b"; + hash = "sha256-CaA2s6HmDrp4FJwhHbsH1oGrxmfizSfkNIbda4/jVQY="; + }) (fetchpatch' { title = "ripgrep: fix shell completions when cross compiling"; saneCommit = "8631ddfb99aa8e935276b27d55ef5e10f5ab0367"; diff --git a/overlays/cross.nix b/overlays/cross.nix index 189787db6..7bfa711e8 100644 --- a/overlays/cross.nix +++ b/overlays/cross.nix @@ -403,8 +403,8 @@ in with final; { # }; # error: "imdi/imdi_make: line 1: ^?ELF^B^A^A^B�^A�@�^W^A@8: not found" - # 2023/12/08: upstreaming is unblocked - argyllcms = needsBinfmtOrQemu prev.argyllcms; + # 2023/12/20: upstreaming is unblocked; implemented in nixpatches/list.nix + # argyllcms = needsBinfmtOrQemu prev.argyllcms; # binutils = prev.binutils.override { # # fix that resulting binary files would specify build #!sh as their interpreter.