diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-09-23 09:31:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-23 09:31:28 +0200 |
| commit | 56853dc6d83a861050bbc02041dbe65f7b1b6f63 (patch) | |
| tree | 70fdf276f8d889018a3ec9fc573e01fa961d289c /pkgs/desktops/gnome-3 | |
| parent | 343ac4d2fc6029ef6a2451d31890903f6afe79f2 (diff) | |
| parent | 92158a4b2cda39ab3990682aa23644462e1a5860 (diff) | |
| download | nixlib-56853dc6d83a861050bbc02041dbe65f7b1b6f63.tar nixlib-56853dc6d83a861050bbc02041dbe65f7b1b6f63.tar.gz nixlib-56853dc6d83a861050bbc02041dbe65f7b1b6f63.tar.bz2 nixlib-56853dc6d83a861050bbc02041dbe65f7b1b6f63.tar.lz nixlib-56853dc6d83a861050bbc02041dbe65f7b1b6f63.tar.xz nixlib-56853dc6d83a861050bbc02041dbe65f7b1b6f63.tar.zst nixlib-56853dc6d83a861050bbc02041dbe65f7b1b6f63.zip | |
Merge pull request #45941 from NixOS/staging-next
Staging next
Diffstat (limited to 'pkgs/desktops/gnome-3')
8 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index 196331ec52ec..e600284550b7 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; preFixup = '' - substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib.dev}/bin/gapplication" + substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib.bin}/bin/gapplication" ''; passthru = { 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 e54741355cac..ad5b40d3c088 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 891d4a70a5f7..38e0d7cfa502 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" |