diff options
Diffstat (limited to 'pkgs/desktops/gnome-3/3.18')
20 files changed, 21 insertions, 21 deletions
diff --git a/pkgs/desktops/gnome-3/3.18/apps/cheese/default.nix b/pkgs/desktops/gnome-3/3.18/apps/cheese/default.nix index db50656cf37a..b5f70d84e520 100644 --- a/pkgs/desktops/gnome-3/3.18/apps/cheese/default.nix +++ b/pkgs/desktops/gnome-3/3.18/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.18/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-calendar/default.nix index cbd5a84bdb55..5fe6583660cb 100644 --- a/pkgs/desktops/gnome-3/3.18/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-calendar/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; buildInputs = [ pkgconfig gtk3 wrapGAppsHook intltool evolution_data_server diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-documents/default.nix index 7f1f70114b7b..5daa7277f7b4 100644 --- a/pkgs/desktops/gnome-3/3.18/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/3.18/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.18/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-photos/default.nix index eaace044af0d..0ba1df2f5a5c 100644 --- a/pkgs/desktops/gnome-3/3.18/apps/gnome-photos/default.nix +++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-photos/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { # doCheck = true; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; buildInputs = [ pkgconfig gtk3 glib intltool itstool gegl babl gnome3.libgdata gnome3.gsettings_desktop_schemas makeWrapper gmp libmediaart diff --git a/pkgs/desktops/gnome-3/3.18/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.18/apps/seahorse/default.nix index 3b78babadd9a..49c48a6b962a 100644 --- a/pkgs/desktops/gnome-3/3.18/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/3.18/apps/seahorse/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr gnome3.gsettings_desktop_schemas makeWrapper gnupg diff --git a/pkgs/desktops/gnome-3/3.18/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.18/core/baobab/default.nix index 2ff85662bbbb..874c7280949a 100644 --- a/pkgs/desktops/gnome-3/3.18/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/baobab/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { doCheck = true; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; diff --git a/pkgs/desktops/gnome-3/3.18/core/evince/default.nix b/pkgs/desktops/gnome-3/3.18/core/evince/default.nix index d0857a1d32ad..7629e5b56550 100644 --- a/pkgs/desktops/gnome-3/3.18/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/evince/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { (if supportXPS then "--enable-xps" else "--disable-xps") ]; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; preConfigure = with stdenv.lib; optionalString doCheck '' diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-calculator/default.nix index fef820010af9..b2135535de14 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-calculator/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-desktop/default.nix index bf0ccd0224ee..7265f09731fd 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/3.18/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.18/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/default.nix index 51e3f6ab3133..c94c178558da 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { doCheck = true; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-disk-utility/default.nix index 3f9f653bdba1..c329d68674a4 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-disk-utility/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { doCheck = true; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-font-viewer/default.nix index 54767dbc4c59..d0ec2307a852 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-font-viewer/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { doCheck = true; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-screenshot/default.nix index 15d93793088b..29ebe8b0ca64 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-screenshot/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { doCheck = true; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-settings-daemon/default.nix index 99e1f596f184..2a93328d8ca0 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/3.18/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.18/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-system-log/default.nix index 6b7b28ad4000..50ee229cfa49 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-system-log/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-system-log/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { doCheck = true; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-user-share/default.nix index e8f649835062..b1fb1eaf3dd4 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-user-share/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { doCheck = true; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; preConfigure = '' sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' -i data/dav_user_2.2.conf @@ -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.18/core/libgdata/default.nix b/pkgs/desktops/gnome-3/3.18/core/libgdata/default.nix index bedbbee2dfe5..8e934e211f80 100644 --- a/pkgs/desktops/gnome-3/3.18/core/libgdata/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/libgdata/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # TODO: need libuhttpmock configureFlags = "--disable-tests"; - NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1"; + NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup.dev}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1"; buildInputs = with gnome3; [ pkgconfig libsoup intltool libxml2 glib gobjectIntrospection diff --git a/pkgs/desktops/gnome-3/3.18/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.18/core/mutter/default.nix index dd08a96cc232..a128990b4029 100644 --- a/pkgs/desktops/gnome-3/3.18/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/mutter/default.nix @@ -6,7 +6,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${gnome3.glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra"; diff --git a/pkgs/desktops/gnome-3/3.18/core/totem/default.nix b/pkgs/desktops/gnome-3/3.18/core/totem/default.nix index cc35ede88f3a..5ffdbc68cb71 100644 --- a/pkgs/desktops/gnome-3/3.18/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/totem/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; diff --git a/pkgs/desktops/gnome-3/3.18/misc/pidgin/default.nix b/pkgs/desktops/gnome-3/3.18/misc/pidgin/default.nix index a2d8d1465795..64f7920d9afc 100644 --- a/pkgs/desktops/gnome-3/3.18/misc/pidgin/default.nix +++ b/pkgs/desktops/gnome-3/3.18/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" |