diff --git a/nixpatches/list.nix b/nixpatches/list.nix index beb5b487..5c3d3f9e 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -297,12 +297,6 @@ in [ saneCommit = "e070195bdf213dffb0164574397b6a7417f81c9e"; hash = "sha256-6JnIJCVBbV4tmFinX7Qv2wO2AThrgxrnyb9T4Ov6p5w="; }) - # (fetchpatch' { - # # N.B.: duplicates merged PR: - # title = "tracker: support cross compilation"; - # saneCommit = "bea390fd0c4fda96db5b1fad06ee071a10561305"; - # hash = "sha256-Y2tVoTvSIIT9ufghqqsXgmqWq9daH+WKj4JHZgWbWwE="; - # }) (fetchpatch' { title = "tracker-miners: support cross compilation"; saneCommit = "24b062309ea8baa2d8303c0610c9ec7b8c399e8b"; diff --git a/overlays/cross.nix b/overlays/cross.nix index 32e5a842..4e6c1a7e 100644 --- a/overlays/cross.nix +++ b/overlays/cross.nix @@ -6,7 +6,6 @@ # - File-BaseDir can be updated to v0.09, which cross compiles with ease # - libgudev builds on servo branch # - blueman builds on servo branch -# - tracker builds on servo branch # - directfb needs investigation on servo # # non-binfmt build status: @@ -1793,9 +1792,6 @@ in { # ''; # }); - # 2023/07/31: upstreaming is unblocked,implemented on servo - # fixes "meson.build:204:12: ERROR: Can not run test applications in this cross environment." - # tracker = addNativeInputs [ final.mesonEmulatorHook ] prev.tracker; # fixes "meson.build:425:23: ERROR: Program 'glib-compile-schemas' not found or not executable" # 2023/07/31: upstreaming is unblocked,implemented on servo # tracker-miners = mvToNativeInputs [ final.glib ] (