diff --git a/overlays/cross.nix b/overlays/cross.nix index a76a52f7..b76ea426 100644 --- a/overlays/cross.nix +++ b/overlays/cross.nix @@ -422,7 +422,7 @@ in with final; { ]; }); - # 2024/05/31: upstreaming is unblocked + # 2024/05/31: upstreaming is unblocked, out for PR: # 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"