public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: use glib tools from build-time $PATH

Browse Source 
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.)
This commit is contained in:
Vladimír Čunát
2018-08-30 19:47:41 +02:00
parent 8fc6472ace
commit 80b25db15c
8 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/audio/gradio/default.nix
+1 -1
View File
@@ -56,7 +56,7 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
postInstall = '' 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 ]; patches = [ ./0001-Remove-post-install-script-that-hardcodes-paths.patch ];
pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
+1 -1
View File
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
mkdir -p $out/share/gsettings-schemas/$name mkdir -p $out/share/gsettings-schemas/$name
mv $out/share/glib-2.0 $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; { meta = with stdenv.lib; {
pkgs/desktops/gnome-3/core/tracker-miners/default.nix
+1 -1
View File
@@ -85,7 +85,7 @@ in stdenv.mkDerivation rec {
''; '';
postInstall = '' postInstall = ''
${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas glib-compile-schemas "$out/share/glib-2.0/schemas"
''; '';
passthru = { passthru = {
pkgs/desktops/gnome-3/core/tracker/default.nix
+1 -1
View File
@@ -40,7 +40,7 @@ in stdenv.mkDerivation rec {
''; '';
postInstall = '' postInstall = ''
${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas glib-compile-schemas "$out/share/glib-2.0/schemas"
''; '';
passthru = { passthru = {
pkgs/desktops/gnome-3/extensions/caffeine/default.nix
+1 -1
View File
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
buildPhase = '' buildPhase = ''
${bash}/bin/bash ./update-locale.sh ${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 = '' installPhase = ''
pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
+1 -1
View File
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
]; ];
buildPhase = '' buildPhase = ''
${glib.dev}/bin/glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas
''; '';
installPhase = '' installPhase = ''
pkgs/desktops/gnome-3/extensions/volume-mixer.nix
+1 -1
View File
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
]; ];
buildPhase = '' buildPhase = ''
${glib.dev}/bin/glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas
''; '';
installPhase = '' installPhase = ''
pkgs/desktops/gnome-3/misc/pidgin/default.nix
+1 -1
View File
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
schemas_dir="$share_dir/gsettings-schemas/${name}/glib-2.0/schemas" schemas_dir="$share_dir/gsettings-schemas/${name}/glib-2.0/schemas"
mkdir -p "$schemas_dir" mkdir -p "$schemas_dir"
mv schemas/* "$schemas_dir" # fix Emacs syntax highlighting: */ 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" locale_dir="$share_dir/locale"
mkdir -p "$locale_dir" mkdir -p "$locale_dir"