public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dbus-glib: split into multiple outputs

Browse Source 
Fixed all 'dbus_glib}' references too.
This commit is contained in:
Vladimír Čunát 2015-10-05 10:51:22 +02:00
parent c817263b0c
commit 68530a4fb7
10 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/roxterm/default.nix
View File

@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
propagatedBuildInputs = propagatedBuildInputs =
[ dbus_libs dbus_glib gdk_pixbuf gettext gsettings_desktop_schemas gtk2 gtk3 hicolor_icon_theme vte ]; [ dbus_libs dbus_glib gdk_pixbuf gettext gsettings_desktop_schemas gtk2 gtk3 hicolor_icon_theme vte ];
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}/include/dbus-1.0"
"-I${dbus_libs}/lib/dbus-1.0/include" ]; "-I${dbus_libs}/lib/dbus-1.0/include" ];

2
pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
View File

@ -11,7 +11,7 @@ let
call_ui = x : x // { call_ui = x : x // {
NIX_CFLAGS_COMPILE = NIX_CFLAGS_COMPILE =
"-I${telepathy_glib}/include/telepathy-1.0" "-I${telepathy_glib}/include/telepathy-1.0"
+ " -I${dbus_glib}/include/dbus-1.0" + " -I${dbus_glib.dev}/include/dbus-1.0"
+ " -I${dbus_libs}/include/dbus-1.0"; + " -I${dbus_libs}/include/dbus-1.0";
}; };
telepathy_logger_qt = x : x // { telepathy_logger_qt = x : x // {

2
pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "18i00l8lnp5dghqmgmpxnn0is2a20pkisxy0sb78hnd2dz0z6xnl"; sha256 = "18i00l8lnp5dghqmgmpxnn0is2a20pkisxy0sb78hnd2dz0z6xnl";
}; };
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";
buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool
gobjectIntrospection dbus_libs ]; gobjectIntrospection dbus_libs ];

2
pkgs/desktops/gnome-3/3.16/core/empathy/default.nix
View File

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas
file libtool librsvg ]; 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}/include/dbus-1.0"
"-I${dbus_libs}/lib/dbus-1.0/include" ]; "-I${dbus_libs}/lib/dbus-1.0/include" ];

2
pkgs/desktops/gnome-3/3.16/core/folks/default.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
configureFlags = "--disable-fatal-warnings"; configureFlags = "--disable-fatal-warnings";
NIX_CFLAGS_COMPILE = ["-I${nspr}/include/nspr" "-I${nss}/include/nss" 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; enableParallelBuilding = true;

2
pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1mpzj6fc42hhx77lki8cdycgfj9gjrm611rh0wsaqam4qq2c9a9c"; 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; enableParallelBuilding = true;

2
pkgs/desktops/gnome-3/3.18/core/empathy/default.nix
View File

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas
file libtool librsvg ]; 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}/include/dbus-1.0"
"-I${dbus_libs}/lib/dbus-1.0/include" ]; "-I${dbus_libs}/lib/dbus-1.0/include" ];

2
pkgs/desktops/gnome-3/3.18/core/folks/default.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
configureFlags = "--disable-fatal-warnings"; configureFlags = "--disable-fatal-warnings";
NIX_CFLAGS_COMPILE = ["-I${nspr}/include/nspr" "-I${nss}/include/nss" 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; enableParallelBuilding = true;

2
pkgs/desktops/gnome-3/3.18/core/gnome-online-accounts/default.nix
View File

@ -7,7 +7,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src; 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; enableParallelBuilding = true;

3
pkgs/development/libraries/dbus-glib/default.nix
View File

@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "1xi1v1msz75qs0s4lkyf1psrksdppa3hwkg0mznc6gpw5flg3hdz"; sha256 = "1xi1v1msz75qs0s4lkyf1psrksdppa3hwkg0mznc6gpw5flg3hdz";
}; };
outputs = [ "out" "doc" ]; outputs = [ "dev" "out" "doc" ]; # "dev-doc" only
outputBin = "dev";
nativeBuildInputs = [ pkgconfig gettext ]; nativeBuildInputs = [ pkgconfig gettext ];