diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-23 03:46:28 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-23 03:52:07 +0300 |
| commit | 311900f0194704e5e0279138ef92b8df594b3180 (patch) | |
| tree | c261db35858733d78694f206101c599c931d528f /pkgs/desktops/gnome-3 | |
| parent | 984e04d7337d23ba88879ca308c6da40d97ec208 (diff) | |
| download | nixpkgs-311900f0194704e5e0279138ef92b8df594b3180.tar nixpkgs-311900f0194704e5e0279138ef92b8df594b3180.tar.gz nixpkgs-311900f0194704e5e0279138ef92b8df594b3180.tar.bz2 nixpkgs-311900f0194704e5e0279138ef92b8df594b3180.tar.lz nixpkgs-311900f0194704e5e0279138ef92b8df594b3180.tar.xz nixpkgs-311900f0194704e5e0279138ef92b8df594b3180.tar.zst nixpkgs-311900f0194704e5e0279138ef92b8df594b3180.zip | |
treewide: Make explicit that 'dev' output of nspr (and glib) is used
Diffstat (limited to 'pkgs/desktops/gnome-3')
| -rw-r--r-- | pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/3.20/core/folks/default.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix index a9bb87d4ddd..6ae149cd570 100644 --- a/pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/3.20/apps/evolution/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--disable-spamassassin" "--disable-pst-import" "--disable-autoar" "--disable-libcryptui" ]; - NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss}/include/nss -I${glib.dev}/include/gio-unix-2.0"; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix index 322dd3bedac..5043d7cf2fe 100644 --- a/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf ]; - NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss}/include/nss -I${glib.dev}/include/gio-unix-2.0"; enableParallelBuilding = true; 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 899ee8e4d75..842864b0b81 100644 --- a/pkgs/desktops/gnome-3/3.20/core/folks/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/folks/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { configureFlags = "--disable-fatal-warnings"; - NIX_CFLAGS_COMPILE = ["-I${nspr}/include/nspr" "-I${nss}/include/nss" + NIX_CFLAGS_COMPILE = ["-I${nspr.dev}/include/nspr" "-I${nss}/include/nss" "-I${dbus_glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0"]; enableParallelBuilding = true; |