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

cross: gcr: push upstream

Browse Source
This commit is contained in:
Colin
2023-10-24 15:28:48 +00:00
parent ec4b974f3d
commit 49fbe5f4fa
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
nixpatches/list.nix
View File

@@ -33,6 +33,13 @@ in [
# hash = "sha256-n6xatVeqMweuy/bm68cxWUkgUoS+H1xNRjT0JDFXeEs="; # hash = "sha256-n6xatVeqMweuy/bm68cxWUkgUoS+H1xNRjT0JDFXeEs=";
hash = "sha256-PXatkvLjEgQJ4rRIjEOadKscM0WYWTozIFt2vzWOMKY="; hash = "sha256-PXatkvLjEgQJ4rRIjEOadKscM0WYWTozIFt2vzWOMKY=";
}) })
(fetchpatch' {
title = "gcr: remove build gnupg from runtime closure";
prUrl = "https://github.com/NixOS/nixpkgs/pull/263158";
saneCommit = "8c71ab22c6df4e5ce290e131a7769688b0c5a017";
# hash = "sha256-9PNKzNlJ62WAq6H+tqlt0spFZ1DPP1hHmpx0YPuieFE=";
hash = "sha256-6hUdsExHSMHy6FMY1+OLtVmKpRwysGIVkcDpYv7RRBk=";
})
(fetchpatch' { (fetchpatch' {
title = "trust-dns: 0.23.0 -> 0.24.0"; title = "trust-dns: 0.23.0 -> 0.24.0";
prUrl = "https://github.com/NixOS/nixpkgs/pull/263054"; prUrl = "https://github.com/NixOS/nixpkgs/pull/263054";

14
overlays/cross.nix
View File

@@ -631,7 +631,7 @@ in {
outputs = lib.remove "devdoc" upstream.outputs; outputs = lib.remove "devdoc" upstream.outputs;
}); });
# 2023/07/31: upstreaming is unblocked # 2023/07/31: upstreaming is blocked on qttranslations (via pipewire)
# N.B.: should be able to remove gnupg/ssh from {native}buildInputs when upstreaming # N.B.: should be able to remove gnupg/ssh from {native}buildInputs when upstreaming
gcr_4 = prev.gcr_4.overrideAttrs (upstream: { gcr_4 = prev.gcr_4.overrideAttrs (upstream: {
# fixes (meson): "ERROR: Program 'gpg2 gpg' not found or not executable" # fixes (meson): "ERROR: Program 'gpg2 gpg' not found or not executable"
@@ -639,11 +639,13 @@ in {
"-Dgpg_path=${final.gnupg}/bin/gpg" "-Dgpg_path=${final.gnupg}/bin/gpg"
]; ];
}); });
gcr = prev.gcr.overrideAttrs (upstream: { # 2023/10/23: upstreaming: <https://github.com/NixOS/nixpkgs/pull/263158>
mesonFlags = (upstream.mesonFlags or []) ++ [ # gcr = prev.gcr.overrideAttrs (upstream: {
"-Dgpg_path=${final.gnupg}/bin/gpg" # # removes build platform's gnupg from runtime closure
]; # mesonFlags = (upstream.mesonFlags or []) ++ [
}); # "-Dgpg_path=${final.gnupg}/bin/gpg"
# ];
# });
# gnustep = prev.gnustep.overrideScope' (self: super: { # gnustep = prev.gnustep.overrideScope' (self: super: {
# # gnustep is going to need a *lot* of work/domain-specific knowledge to truly cross-compile, # # gnustep is going to need a *lot* of work/domain-specific knowledge to truly cross-compile,
# # base = emulated.gnustep.base; # # base = emulated.gnustep.base;