From fbb7d9314897a6ca3238b65d6bb8f8f7108485d9 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 23 Aug 2016 03:31:05 +0300 Subject: [PATCH] treewide: Make explicit that 'dev' output of dbus_glib is used --- pkgs/desktops/gnome-3/3.20/core/empathy/default.nix | 2 +- pkgs/desktops/gnome-3/3.20/core/folks/default.nix | 2 +- .../gnome-3/3.20/core/gnome-online-accounts/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.20/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.20/core/empathy/default.nix index 207ccbe1d36..39706b49b17 100644 --- a/pkgs/desktops/gnome-3/3.20/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/3.20/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.20/core/folks/default.nix b/pkgs/desktops/gnome-3/3.20/core/folks/default.nix index 5daa33629ff..086a92a5e2e 100644 --- a/pkgs/desktops/gnome-3/3.20/core/folks/default.nix +++ b/pkgs/desktops/gnome-3/3.20/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.20/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-online-accounts/default.nix index 703d55e42d0..8ad6fd2cd13 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-online-accounts/default.nix +++ b/pkgs/desktops/gnome-3/3.20/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;