From aa5519aae6e5afb03c52e8e62b4aae40ee7222c6 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Fri, 21 May 2021 00:18:40 +0000 Subject: [PATCH] 3p/nixpkgs: remove tracker-i686 patch --- third_party/nixpkgs/patches/series | 1 - .../nixpkgs/patches/tracker-i686.patch | 30 ------------------- 2 files changed, 31 deletions(-) delete mode 100644 third_party/nixpkgs/patches/tracker-i686.patch diff --git a/third_party/nixpkgs/patches/series b/third_party/nixpkgs/patches/series index 7b0adc87b9..bc475f75d8 100644 --- a/third_party/nixpkgs/patches/series +++ b/third_party/nixpkgs/patches/series @@ -1,5 +1,4 @@ various.patch patch-cherrypy.patch pomerium-fix.patch -tracker-i686.patch pr122242.patch diff --git a/third_party/nixpkgs/patches/tracker-i686.patch b/third_party/nixpkgs/patches/tracker-i686.patch deleted file mode 100644 index 1e168aee66..0000000000 --- a/third_party/nixpkgs/patches/tracker-i686.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix ---- a/pkgs/development/libraries/tracker/default.nix -+++ b/pkgs/development/libraries/tracker/default.nix -@@ -43,7 +43,7 @@ stdenv.mkDerivation rec { - src = ./fix-paths.patch; - inherit asciidoc; - }) -- ]; -+ ] ++ lib.optional stdenv.isi686 ./i686-tracker-fix.patch; - - nativeBuildInputs = [ - meson -diff --git a/pkgs/development/libraries/tracker/i686-tracker-fix.patch b/pkgs/development/libraries/tracker/i686-tracker-fix.patch -new file mode 100644 ---- /dev/null -+++ b/pkgs/development/libraries/tracker/i686-tracker-fix.patch -@@ -0,0 +1,13 @@ -+diff -u -r tracker-3.0.3_pristine/tests/libtracker-data/tracker-sparql-test.c tracker-3.0.3/tests/libtracker-data/tracker-sparql-test.c -+--- tracker-3.0.3_pristine/tests/libtracker-data/tracker-sparql-test.c 2021-01-10 17:46:25.607677700 +0000 -++++ tracker-3.0.3/tests/libtracker-data/tracker-sparql-test.c 2021-04-07 01:44:49.863184812 +0000 -+@@ -92,9 +92,7 @@ -+ { "construct/construct-where", "construct/data", FALSE }, -+ { "construct/construct-pattern", "construct/data", FALSE }, -+ { "construct/construct-with-modifiers", "construct/data", FALSE }, -+- { "datetime/direct-1", "datetime/data-1", FALSE }, -+ { "datetime/delete-1", "datetime/data-3", FALSE }, -+- { "datetime/insert-1", "datetime/data-4", FALSE }, -+ { "datetime/functions-localtime-1", "datetime/data-1", FALSE }, -+ { "datetime/functions-timezone-1", "datetime/data-2", FALSE }, -+ { "datetime/functions-timezone-2", "datetime/data-2", FALSE },