diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-30 19:45:19 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-30 19:47:41 +0200 |
commit | 80b25db15cdbb3971ae739a6eca998da6845c174 (patch) | |
tree | 1899364f735acdee4e9256fd5047d75aa98b9d0b | |
parent | 8fc6472ace275f24a0530eb191d5d89bc8aee35e (diff) | |
download | nixlib-80b25db15cdbb3971ae739a6eca998da6845c174.tar nixlib-80b25db15cdbb3971ae739a6eca998da6845c174.tar.gz nixlib-80b25db15cdbb3971ae739a6eca998da6845c174.tar.bz2 nixlib-80b25db15cdbb3971ae739a6eca998da6845c174.tar.lz nixlib-80b25db15cdbb3971ae739a6eca998da6845c174.tar.xz nixlib-80b25db15cdbb3971ae739a6eca998da6845c174.tar.zst nixlib-80b25db15cdbb3971ae739a6eca998da6845c174.zip |
treewide: use glib tools from build-time $PATH
Using explicit output feels more flaky in case we e.g. move the binary. (No strong opinion on my side, feel free to revert if you think so.)
8 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix index ed34c3118c68..0e636c532b46 100644 --- a/pkgs/applications/audio/gradio/default.nix +++ b/pkgs/applications/audio/gradio/default.nix @@ -56,7 +56,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; postInstall = '' - ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas + glib-compile-schemas "$out"/share/glib-2.0/schemas ''; patches = [ ./0001-Remove-post-install-script-that-hardcodes-paths.patch ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix index da117a536911..5ae579417aec 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/share/gsettings-schemas/$name mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name - ${glib.dev}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas + glib-compile-schemas "$out/share/gsettings-schemas/$name/glib-2.0/schemas" ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix index 67c43311123c..f33970251d5b 100644 --- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix @@ -85,7 +85,7 @@ in stdenv.mkDerivation rec { ''; postInstall = '' - ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas + glib-compile-schemas "$out/share/glib-2.0/schemas" ''; passthru = { diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix index a0da1b7147d2..5d6b326d21d8 100644 --- a/pkgs/desktops/gnome-3/core/tracker/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker/default.nix @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { ''; postInstall = '' - ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas + glib-compile-schemas "$out/share/glib-2.0/schemas" ''; passthru = { diff --git a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix b/pkgs/desktops/gnome-3/extensions/caffeine/default.nix index d556c5e55ca4..cc9451597169 100644 --- a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix +++ b/pkgs/desktops/gnome-3/extensions/caffeine/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildPhase = '' ${bash}/bin/bash ./update-locale.sh - ${glib.dev}/bin/glib-compile-schemas --strict --targetdir=caffeine@patapon.info/schemas/ caffeine@patapon.info/schemas + glib-compile-schemas --strict --targetdir=caffeine@patapon.info/schemas/ caffeine@patapon.info/schemas ''; installPhase = '' diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix index 395e90d263ef..b4b34d91c18e 100644 --- a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; buildPhase = '' - ${glib.dev}/bin/glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas + glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas ''; installPhase = '' diff --git a/pkgs/desktops/gnome-3/extensions/volume-mixer.nix b/pkgs/desktops/gnome-3/extensions/volume-mixer.nix index 1487efe0a23f..19ced0b5252c 100644 --- a/pkgs/desktops/gnome-3/extensions/volume-mixer.nix +++ b/pkgs/desktops/gnome-3/extensions/volume-mixer.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ]; buildPhase = '' - ${glib.dev}/bin/glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas + glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas ''; installPhase = '' diff --git a/pkgs/desktops/gnome-3/misc/pidgin/default.nix b/pkgs/desktops/gnome-3/misc/pidgin/default.nix index a5dd1480d3db..c11fdfa6099e 100644 --- a/pkgs/desktops/gnome-3/misc/pidgin/default.nix +++ b/pkgs/desktops/gnome-3/misc/pidgin/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { schemas_dir="$share_dir/gsettings-schemas/${name}/glib-2.0/schemas" mkdir -p "$schemas_dir" mv schemas/* "$schemas_dir" # fix Emacs syntax highlighting: */ - ${glib.dev}/bin/glib-compile-schemas "$schemas_dir" + glib-compile-schemas "$schemas_dir" locale_dir="$share_dir/locale" mkdir -p "$locale_dir" |