lukegb/depot
1
0
Fork 0
Code Issues 1 Pull requests Projects Packages Activity Actions

3p/nixpkgs: fix gtk+ tracker build under i686

Browse source
This commit is contained in:
Luke Granger-Brown 2021-04-07 01:49:26 +00:00
parent 5c141d1b07
commit 3359a8d6b4
4 changed files with 45 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
third_party/nixpkgs/patches/series vendored
View file

@ -2,3 +2,4 @@ various.patch
patch-cherrypy.patch patch-cherrypy.patch
pomerium-fix.patch pomerium-fix.patch
dino-vala-boxing.patch dino-vala-boxing.patch
tracker-i686.patch

30
third_party/nixpkgs/patches/tracker-i686.patch vendored Normal file
View file

@ -0,0 +1,30 @@
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 },

2
third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix vendored
View file

@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
src = ./fix-paths.patch; src = ./fix-paths.patch;
inherit asciidoc; inherit asciidoc;
}) })
]; ] ++ lib.optional stdenv.isi686 ./i686-tracker-fix.patch;
nativeBuildInputs = [ nativeBuildInputs = [
meson meson

13
third_party/nixpkgs/pkgs/development/libraries/tracker/i686-tracker-fix.patch vendored Normal file
View file

@ -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 },