From 18d6f1f3fda4c13dabed55a5c85b393c45d40527 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 5 Sep 2018 00:52:59 +0000 Subject: [PATCH] =?UTF-8?q?gnome3.tracker-miners:=202.1.3=20=E2=86=92=202.?= =?UTF-8?q?1.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desktops/gnome-3/core/tracker-miners/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix index 1f28c9f0fd05..5e57a22906c8 100644 --- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix @@ -8,11 +8,11 @@ let pname = "tracker-miners"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "2.1.3"; + version = "2.1.5"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "10j6iifq0ccnqckdx7fqlrfifbvs08jbczgxajldz26057kwp8fz"; + sha256 = "1kdq7fk9c80ngg65p31pjdk4za0fq7nfhblqsma9alvkam5kvzgm"; }; nativeBuildInputs = [ @@ -63,6 +63,7 @@ in stdenv.mkDerivation rec { mesonFlags = [ # TODO: tests do not like our sandbox "-Dfunctional_tests=false" + "-Ddbus_services=${placeholder "out"}/share/dbus-1/services" ]; patches = [ @@ -77,13 +78,6 @@ in stdenv.mkDerivation rec { }) ]; - # Symlinks require absolute path and we still cannot use placeholders - # https://github.com/NixOS/nixpkgs/pull/39534#discussion_r184339131 - # https://github.com/NixOS/nixpkgs/pull/37693 - preConfigure = '' - mesonFlagsArray+=("-Ddbus_services=$out/share/dbus-1/services") - ''; - postInstall = '' glib-compile-schemas "$out/share/glib-2.0/schemas" '';