From 68530a4fb7ac26c5893a6204e1dde4535f38f149 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Mon, 5 Oct 2015 10:51:22 +0200 Subject: dbus-glib: split into multiple outputs Fixed all 'dbus_glib}' references too. --- pkgs/desktops/gnome-3/3.16/core/empathy/default.nix | 2 +- pkgs/desktops/gnome-3/3.16/core/folks/default.nix | 2 +- pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix | 2 +- pkgs/desktops/gnome-3/3.18/core/empathy/default.nix | 2 +- pkgs/desktops/gnome-3/3.18/core/folks/default.nix | 2 +- pkgs/desktops/gnome-3/3.18/core/gnome-online-accounts/default.nix | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs/desktops/gnome-3') diff --git a/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix index 4c42c6c026d3..83f33fbc3c56 100644 --- a/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas file libtool librsvg ]; - NIX_CFLAGS_COMPILE = [ "-I${dbus_glib}/include/dbus-1.0" + NIX_CFLAGS_COMPILE = [ "-I${dbus_glib.dev}/include/dbus-1.0" "-I${dbus_libs}/include/dbus-1.0" "-I${dbus_libs}/lib/dbus-1.0/include" ]; diff --git a/pkgs/desktops/gnome-3/3.16/core/folks/default.nix b/pkgs/desktops/gnome-3/3.16/core/folks/default.nix index 6e200bdb3188..41e75a38c763 100644 --- a/pkgs/desktops/gnome-3/3.16/core/folks/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/folks/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { configureFlags = "--disable-fatal-warnings"; NIX_CFLAGS_COMPILE = ["-I${nspr}/include/nspr" "-I${nss}/include/nss" - "-I${dbus_glib}/include/dbus-1.0" "-I${dbus_libs}/include/dbus-1.0"]; + "-I${dbus_glib.dev}/include/dbus-1.0" "-I${dbus_libs}/include/dbus-1.0"]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix index ac285819e8f4..6cedbca61d70 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1mpzj6fc42hhx77lki8cdycgfj9gjrm611rh0wsaqam4qq2c9a9c"; }; - NIX_CFLAGS_COMPILE = "-I${dbus_glib}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0"; + NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0"; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/3.18/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.18/core/empathy/default.nix index 4c42c6c026d3..83f33fbc3c56 100644 --- a/pkgs/desktops/gnome-3/3.18/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/empathy/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas file libtool librsvg ]; - NIX_CFLAGS_COMPILE = [ "-I${dbus_glib}/include/dbus-1.0" + NIX_CFLAGS_COMPILE = [ "-I${dbus_glib.dev}/include/dbus-1.0" "-I${dbus_libs}/include/dbus-1.0" "-I${dbus_libs}/lib/dbus-1.0/include" ]; diff --git a/pkgs/desktops/gnome-3/3.18/core/folks/default.nix b/pkgs/desktops/gnome-3/3.18/core/folks/default.nix index 6e200bdb3188..41e75a38c763 100644 --- a/pkgs/desktops/gnome-3/3.18/core/folks/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/folks/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { configureFlags = "--disable-fatal-warnings"; NIX_CFLAGS_COMPILE = ["-I${nspr}/include/nspr" "-I${nss}/include/nss" - "-I${dbus_glib}/include/dbus-1.0" "-I${dbus_libs}/include/dbus-1.0"]; + "-I${dbus_glib.dev}/include/dbus-1.0" "-I${dbus_libs}/include/dbus-1.0"]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-online-accounts/default.nix index d810fbb862b7..b08aa1c99907 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-online-accounts/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-online-accounts/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - NIX_CFLAGS_COMPILE = "-I${dbus_glib}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0"; + NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0"; enableParallelBuilding = true; -- cgit 1.4.1