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

glib-networking: split the dev output

Browse Source 
That's done to get rid of propagatedBuildInputs from regular closure.
Also references were fixed, mainly to its gio modules.
This commit is contained in:
Vladimír Čunát 2015-10-11 16:06:34 +02:00
parent 8db97583ae
commit 8e381b89a1
15 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/x11/desktop-managers/gnome3.nix
View File

@ -148,7 +148,7 @@ in {
}; };
environment.variables.GIO_EXTRA_MODULES = [ "${gnome3.dconf}/lib/gio/modules" environment.variables.GIO_EXTRA_MODULES = [ "${gnome3.dconf}/lib/gio/modules"
"${gnome3.glib_networking}/lib/gio/modules" "${gnome3.glib_networking.out}/lib/gio/modules"
"${gnome3.gvfs}/lib/gio/modules" ]; "${gnome3.gvfs}/lib/gio/modules" ];
environment.systemPackages = gnome3.corePackages ++ cfg.sessionPath environment.systemPackages = gnome3.corePackages ++ cfg.sessionPath
++ (removePackagesByName gnome3.optionalPackages config.environment.gnome3.excludePackages); ++ (removePackagesByName gnome3.optionalPackages config.environment.gnome3.excludePackages);

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

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
preFixup = '' preFixup = ''
wrapProgram "$out/bin/surf" \ wrapProgram "$out/bin/surf" \
--prefix GIO_EXTRA_MODULES : ${glib_networking}/lib/gio/modules \ --prefix GIO_EXTRA_MODULES : ${glib_networking.out}/lib/gio/modules \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
''; '';

4
pkgs/applications/networking/browsers/dwb/default.nix
View File

@ -18,10 +18,10 @@ stdenv.mkDerivation {
preFixup='' preFixup=''
wrapProgram "$out/bin/dwb" \ wrapProgram "$out/bin/dwb" \
--prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules:${dconf}/lib/gio/modules" \ --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules:${dconf}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share"
wrapProgram "$out/bin/dwbem" \ wrapProgram "$out/bin/dwbem" \
--prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

2
pkgs/applications/networking/browsers/jumanji/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
preFixup='' preFixup=''
wrapProgram "$out/bin/jumanji" \ wrapProgram "$out/bin/jumanji" \
--prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
''; '';

2
pkgs/applications/networking/browsers/luakit/default.nix
View File

@ -45,7 +45,7 @@ stdenv.mkDerivation {
in '' in ''
make DEVELOPMENT_PATHS=0 INSTALLDIR=$out DESTDIR=$out PREFIX=$out USE_GTK3=1 install make DEVELOPMENT_PATHS=0 INSTALLDIR=$out DESTDIR=$out PREFIX=$out USE_GTK3=1 install
wrapProgram $out/bin/luakit \ wrapProgram $out/bin/luakit \
--prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share:$out/usr/share/:$out/share/:$GSETTINGS_SCHEMAS_PATH" \ --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share:$out/usr/share/:$out/share/:$GSETTINGS_SCHEMAS_PATH" \
--prefix XDG_CONFIG_DIRS : "$out/etc/xdg" \ --prefix XDG_CONFIG_DIRS : "$out/etc/xdg" \
--set LUA_PATH '"${luaKitPath};${luaPath};"' \ --set LUA_PATH '"${luaKitPath};${luaPath};"' \

2
pkgs/applications/networking/browsers/midori/default.nix
View File

@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
preFixup = '' preFixup = ''
wrapProgram $out/bin/midori \ wrapProgram $out/bin/midori \
--prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
''; '';
} }

2
pkgs/applications/networking/browsers/uzbl/default.nix
View File

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
preFixup = '' preFixup = ''
for f in $out/bin/*; do for f in $out/bin/*; do
wrapProgram $f \ wrapProgram $f \
--prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \
--prefix PYTHONPATH : "$PYTHONPATH" \ --prefix PYTHONPATH : "$PYTHONPATH" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share"
done done

2
pkgs/applications/networking/browsers/vimb/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
preFixup = '' preFixup = ''
wrapProgram "$out/bin/vimb" \ wrapProgram "$out/bin/vimb" \
--prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
''; '';

2
pkgs/applications/networking/browsers/vimprobable2/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
preFixup = '' preFixup = ''
wrapProgram "$out/bin/vimprobable2" \ wrapProgram "$out/bin/vimprobable2" \
--prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
''; '';

2
pkgs/applications/networking/newsreaders/liferea/default.nix
View File

@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
wrapProgram "$f" \ wrapProgram "$f" \
--prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \ --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules:${glib_networking}/lib/gio/modules" \ --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules:${glib_networking.out}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
done done
''; '';

2
pkgs/applications/video/miro/default.nix
View File

@ -64,7 +64,7 @@ buildPythonPackage rec {
mv "$out/bin/miro.real" "$out/bin/miro" mv "$out/bin/miro.real" "$out/bin/miro"
wrapProgram "$out/bin/miro" \ wrapProgram "$out/bin/miro" \
--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \
--prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share"
''; '';

4
pkgs/development/libraries/glib-networking/default.nix
View File

@ -13,10 +13,12 @@ stdenv.mkDerivation rec {
sha256 = "8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346"; sha256 = "8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346";
}; };
outputs = [ "dev" "out" ]; # to deal with propagatedBuildInputs
configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt";
preBuild = '' preBuild = ''
sed -e "s@${glib}/lib/gio/modules@$out/lib/gio/modules@g" -i $(find . -name Makefile) sed -e "s@${glib.out}/lib/gio/modules@$out/lib/gio/modules@g" -i $(find . -name Makefile)
''; '';
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig intltool ];

2
pkgs/development/libraries/libsoup/default.nix
View File

@ -22,7 +22,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ] propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ]
++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring ]; ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring ];
passthru.propagatedUserEnvPackages = [ glib_networking ]; passthru.propagatedUserEnvPackages = [ glib_networking.out ];
# glib_networking is a runtime dependency, not a compile-time dependency # glib_networking is a runtime dependency, not a compile-time dependency
configureFlags = "--disable-tls-check" + stdenv.lib.optionalString (!gnomeSupport) " --without-gnome"; configureFlags = "--disable-tls-check" + stdenv.lib.optionalString (!gnomeSupport) " --without-gnome";

2
pkgs/tools/networking/megatools/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
for i in $(find $out/bin/ -type f); do for i in $(find $out/bin/ -type f); do
wrapProgram "$i" \ wrapProgram "$i" \
--prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
done done
''; '';

2
pkgs/tools/networking/network-manager-applet/default.nix
View File

@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
preFixup = '' preFixup = ''
wrapProgram "$out/bin/nm-applet" \ wrapProgram "$out/bin/nm-applet" \
--prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules:${gnome3.dconf}/lib/gio/modules" \ --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules:${gnome3.dconf}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
--set GCONF_CONFIG_SOURCE "xml::~/.gconf" \ --set GCONF_CONFIG_SOURCE "xml::~/.gconf" \
--prefix PATH ":" "${gnome3.gconf}/bin" --prefix PATH ":" "${gnome3.gconf}/bin"