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

cross compilation: don't emulate file-roller

Browse Source
This commit is contained in:
Colin 2023-02-22 09:03:15 +00:00
parent c8a8fe73ca
commit f8ab8b290e
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hosts/common/cross.nix
View File

@ -455,10 +455,14 @@ in
# # doesn't fix "CMake Error: try_run() invoked in cross-compiling mode, please set the following cache variables appropriately" # # doesn't fix "CMake Error: try_run() invoked in cross-compiling mode, please set the following cache variables appropriately"
# nativeBuildInputs = orig.nativeBuildInputs ++ [ next.perl ]; # nativeBuildInputs = orig.nativeBuildInputs ++ [ next.perl ];
# }); # });
file-roller = super.file-roller.override { # file-roller = super.file-roller.override {
# fixes "src/meson.build:106:0: ERROR: Program 'glib-compile-resources' not found or not executable" # # fixes "src/meson.build:106:0: ERROR: Program 'glib-compile-resources' not found or not executable"
inherit (emulated) stdenv; # inherit (emulated) stdenv;
}; # };
file-roller = super.file-roller.overrideAttrs (orig: {
# fixes: "src/meson.build:106:0: ERROR: Program 'glib-compile-resources' not found or not executable"
nativeBuildInputs = orig.nativeBuildInputs ++ [ next.glib ];
});
gnome-color-manager = super.gnome-color-manager.overrideAttrs (orig: { gnome-color-manager = super.gnome-color-manager.overrideAttrs (orig: {
# fixes: "src/meson.build:3:0: ERROR: Program 'glib-compile-resources' not found or not executable" # fixes: "src/meson.build:3:0: ERROR: Program 'glib-compile-resources' not found or not executable"
nativeBuildInputs = orig.nativeBuildInputs ++ [ next.glib ]; nativeBuildInputs = orig.nativeBuildInputs ++ [ next.glib ];