diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-16 19:57:59 +0300 |
|---|---|---|
| committer | Damien Cassou <damien@cassou.me> | 2016-07-08 17:26:15 +0200 |
| commit | 8cad701fc529a641bac8d3255440ebf9943776b8 (patch) | |
| tree | 09b8bd5750c8e43b1ce09817f6eaa6952a27730f /pkgs/desktops | |
| parent | ed9f4e16f3b914c63ff0b939dc0df4a683d5f2ff (diff) | |
| download | nixlib-8cad701fc529a641bac8d3255440ebf9943776b8.tar nixlib-8cad701fc529a641bac8d3255440ebf9943776b8.tar.gz nixlib-8cad701fc529a641bac8d3255440ebf9943776b8.tar.bz2 nixlib-8cad701fc529a641bac8d3255440ebf9943776b8.tar.lz nixlib-8cad701fc529a641bac8d3255440ebf9943776b8.tar.xz nixlib-8cad701fc529a641bac8d3255440ebf9943776b8.tar.zst nixlib-8cad701fc529a641bac8d3255440ebf9943776b8.zip | |
treewide: Make explicit that 'dev' output of glib is used
Diffstat (limited to 'pkgs/desktops')
6 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/desktops/gnome-3/3.20/apps/cheese/default.nix b/pkgs/desktops/gnome-3/3.20/apps/cheese/default.nix index db50656cf37a..b5f70d84e520 100644 --- a/pkgs/desktops/gnome-3/3.20/apps/cheese/default.nix +++ b/pkgs/desktops/gnome-3/3.20/apps/cheese/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Cheese; diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-documents/default.nix index 7f1f70114b7b..5daa7277f7b4 100644 --- a/pkgs/desktops/gnome-3/3.20/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/3.20/apps/gnome-documents/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; preFixup = '' - substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib}/bin/gapplication" + substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib.dev}/bin/gapplication" gappsWrapperArgs+=(--run 'if [ -z "$XDG_CACHE_DIR" ]; then XDG_CACHE_DIR=$HOME/.cache; fi; if [ -w "$XDG_CACHE_DIR/.." ]; then mkdir -p "$XDG_CACHE_DIR/gnome-documents"; fi') ''; diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-desktop/default.nix index bf0ccd0224ee..7265f09731fd 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/gnome-desktop/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; # this should probably be setuphook for glib - NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-settings-daemon/default.nix index 99e1f596f184..2a93328d8ca0 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/gnome-settings-daemon/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; # fatal error: gio/gunixfdlist.h: No such file or directory - NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; buildInputs = with gnome3; [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas networkmanager diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-user-share/default.nix index 49ad40912c66..31351194fb03 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/gnome-user-share/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/share/gsettings-schemas/$name mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name - ${glib}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas + ${glib.dev}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas ''; preFixup = '' diff --git a/pkgs/desktops/gnome-3/3.20/misc/pidgin/default.nix b/pkgs/desktops/gnome-3/3.20/misc/pidgin/default.nix index a2d8d1465795..64f7920d9afc 100644 --- a/pkgs/desktops/gnome-3/3.20/misc/pidgin/default.nix +++ b/pkgs/desktops/gnome-3/3.20/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}/bin/glib-compile-schemas "$schemas_dir" + ${glib.dev}/bin/glib-compile-schemas "$schemas_dir" locale_dir="$share_dir/locale" mkdir -p "$locale_dir" |