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

cross: fix nautilus; reduce emulation for tracker{,-miners}

Browse Source
This commit is contained in:
Colin
2023-07-29 10:57:05 +00:00
parent 8c0b215832
commit abf80d765c
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
overlays/cross.nix
View File

@@ -520,15 +520,16 @@ in {
# # new failure mode: "/nix/store/grqh2wygy9f9wp5bgvqn4im76v82zmcx-binutils-2.39/bin/ld: /nix/store/f7yr5z123d162p5457jh3wzkqm7x8yah-glib-2.74.3/lib/libglib-2.0.so: error adding symbols: file in wrong format" # # new failure mode: "/nix/store/grqh2wygy9f9wp5bgvqn4im76v82zmcx-binutils-2.39/bin/ld: /nix/store/f7yr5z123d162p5457jh3wzkqm7x8yah-glib-2.74.3/lib/libglib-2.0.so: error adding symbols: file in wrong format"
# inherit (emulated) stdenv; # inherit (emulated) stdenv;
# }; # };
# nautilus = ( nautilus = (
# addInputs { addInputs {
# # fixes: "meson.build:123:0: ERROR: Dependency "libxml-2.0" not found, tried pkgconfig" # fixes: "meson.build:123:0: ERROR: Dependency "libxml-2.0" not found, tried pkgconfig"
# buildInputs = [ final.libxml2 ]; buildInputs = [ final.libxml2 ];
# # fixes: "meson.build:226:6: ERROR: Program 'gtk-update-icon-cache' not found or not executable" # fixes: "meson.build:226:6: ERROR: Program 'gtk-update-icon-cache' not found or not executable"
# nativeBuildInputs = [ final.gtk4 ]; nativeBuildInputs = [ final.gtk4 ];
# } }
# super.nautilus super.nautilus
# ).override { );
# .override {
# # fixes -msse2, -mfpmath=sse flags # # fixes -msse2, -mfpmath=sse flags
# # wrapGAppsHook4 = final.wrapGAppsHook; # # wrapGAppsHook4 = final.wrapGAppsHook;
# # fixes -msse2, -mfpmath=ssh flags AND "Settings schema 'org.gtk.gtk4.Settings.FileChooser' is not installed" # # fixes -msse2, -mfpmath=ssh flags AND "Settings schema 'org.gtk.gtk4.Settings.FileChooser' is not installed"
@@ -1319,11 +1320,12 @@ in {
''; '';
}); });
# fixes "meson.build:204:12: ERROR: Can not run test applications in this cross environment." # fixes "meson.build:204:12: ERROR: Can not run test applications in this cross environment."
tracker = useEmulatedStdenv prev.tracker; tracker = addNativeInputs [ final.mesonEmulatorHook ] prev.tracker;
tracker-miners = prev.tracker-miners.override { # fixes "meson.build:425:23: ERROR: Program 'glib-compile-schemas' not found or not executable"
tracker-miners = mvToNativeInputs [ final.glib ] (
# fixes "meson.build:183:0: ERROR: Can not run test applications in this cross environment." # fixes "meson.build:183:0: ERROR: Can not run test applications in this cross environment."
inherit (emulated) stdenv; addNativeInputs [ final.mesonEmulatorHook ] prev.tracker-miners
}; );
tuba = prev.tuba.overrideAttrs (upstream: { tuba = prev.tuba.overrideAttrs (upstream: {
# error: Package `{libadwaita-1,gtksourceview-5,libsecret-1,gee-0.8}' not found in specified Vala API directories or GObject-Introspection GIR directories # error: Package `{libadwaita-1,gtksourceview-5,libsecret-1,gee-0.8}' not found in specified Vala API directories or GObject-Introspection GIR directories
buildInputs = upstream.buildInputs ++ [ final.vala ]; buildInputs = upstream.buildInputs ++ [ final.vala ];

8
overlays/disable-flakey-tests.nix
View File

@@ -8,12 +8,18 @@
let let
dontCheck = p: p.overrideAttrs (_: { dontCheck = p: p.overrideAttrs (_: {
doCheck = false; doCheck = false;
doInstallCheck = false;
});
dontCheckAarch64 = p: p.overrideAttrs (_: next.lib.optionalAttrs (p.stdenv.targetPlatform.system == "aarch64-linux") {
# only `dontCheck` if the package is being built for aarch64
doCheck = false;
doInstallCheck = false;
}); });
in { in {
# 2023/07/27 # 2023/07/27
# 4 tests fail when building `host-pkgs.moby.emulated.elfutils` # 4 tests fail when building `host-pkgs.moby.emulated.elfutils`
# it might be enough to only disable checks when targeting aarch64, which could reduce rebuilds? # it might be enough to only disable checks when targeting aarch64, which could reduce rebuilds?
elfutils = dontCheck prev.elfutils; elfutils = dontCheckAarch64 prev.elfutils;
pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [ pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
(py-next: py-prev: { (py-next: py-prev: {