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

overlays/cross: update upstreaming status

Browse Source 
my part of the gnome2.GConf fix was actually upstreamed a year ago; the package fails for a different reason
This commit is contained in:
Colin 2024-05-31 09:04:16 +00:00
parent 7a701f92eb
commit 5cba283859
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
overlays/cross.nix
View File

@ -422,7 +422,7 @@ in with final; {
];
});
# 2024/05/31: upstreaming is unblocked
# 2024/05/31: upstreaming is unblocked, out for PR: <https://github.com/NixOS/nixpkgs/pull/316096>
# fixes: "src/meson.build:3:0: ERROR: Program 'glib-compile-resources' not found or not executable"
# gnome-color-manager = mvToNativeInputs [ glib ] super.gnome-color-manager;
@ -517,18 +517,7 @@ in with final; {
});
# gnome2 = prev.gnome2.overrideScope (self: super: {
# # 2024/05/31: upstreaming is unblocked
# # GConf = (
# # # python3 -> nativeBuildInputs fixes "2to3: command not found"
# # # glib.dev in nativeBuildInputs fixes "gconfmarshal.list: command not found"
# # # new error: "** (orbit-idl-2): WARNING **: ./GConfX.idl compilation failed"
# # addNativeInputs
# # [ glib.dev ]
# # (mvToNativeInputs [ python3 ] super.GConf);
# # );
# # avoid gconf. last release was 2013: it's dead.
#
# # 2024/05/31: upstreaming is blocked on gconf
# # 2024/05/31: upstreaming is blocked on gconf (ORBit2)
# # gnome_vfs = (
# # # fixes: "configure: error: gconftool-2 executable not found in your path - should be installed with GConf"
# # # new error: "configure: error: cannot run test program while cross compiling"