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/gnome-3/3.20/core | |
| 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/gnome-3/3.20/core')
3 files changed, 3 insertions, 3 deletions
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 = '' |