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

rename moveToOutput and propagatedBuildInputs

Browse Source
This commit is contained in:
Luca Bruno
2015-12-02 10:03:23 +01:00
parent 0d2ac2b08c
commit e289717414
26 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
sha1 = "3137feb503a89a8d606405373905b92dcf7e293b";
}) ];
postFixup = ''_moveToOutput share/aclocal "$dev" '';
postFixup = ''moveToOutput share/aclocal "$dev" '';
crossAttrs =stdenv.lib.optionalAttrs (stdenv.cross.libc == "libSystem") {
patches = let

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

@@ -65,7 +65,7 @@ self = stdenv.mkDerivation {
# it's executed from $lib by absolute path
postFixup = ''
_moveToOutput bin/dbus-launch "$lib"
moveToOutput bin/dbus-launch "$lib"
ln -s "$lib/bin/dbus-launch" "$out/bin/"
'';

4
pkgs/development/libraries/ffmpeg/generic.nix
View File

@@ -153,8 +153,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
postFixup = ''
_moveToOutput bin "$bin"
_moveToOutput share/ffmpeg/examples "$doc"
moveToOutput bin "$bin"
moveToOutput share/ffmpeg/examples "$doc"
'';
/* Cross-compilation is untested, consider this an outline, more work

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

@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
DETERMINISTIC_BUILD = 1;
postInstall = ''
_moveToOutput "share/glib-2.0" "$dev"
moveToOutput "share/glib-2.0" "$dev"
substituteInPlace "$dev/bin/gdbus-codegen" --replace "$out" "$dev"
sed -i "$dev/bin/glib-gettextize" -e "s|^gettext_dir=.*|gettext_dir=$dev/share/glib-2.0/gettext|"
'';

2
pkgs/development/libraries/gobject-introspection/setup-hook.sh
View File

@@ -14,7 +14,7 @@ make_gobject_introspection_find_gir_files() {
envHooks+=(make_gobject_introspection_find_gir_files)
_multioutMoveGlibGir() {
_moveToOutput share/gir-1.0 "${!outputDev}"
moveToOutput share/gir-1.0 "${!outputDev}"
}
preFixupHooks+=(_multioutMoveGlibGir)

2
pkgs/development/libraries/gtk+/2.x.nix
View File

@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
else "--with-xinput=yes";
postInstall = ''
_moveToOutput share/gtk-2.0/demo "$docdev"
moveToOutput share/gtk-2.0/demo "$docdev"
'';
passthru = {

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

@@ -40,7 +40,7 @@ stdenv.mkDerivation {
sed -i 's/INSTALL_CMD=.*install/INSTALL_CMD=install/' $out/lib/icu/${version}/pkgdata.inc
'';
postFixup = ''_moveToOutput lib/icu "$dev" '';
postFixup = ''moveToOutput lib/icu "$dev" '';
enableParallelBuilding = true;

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

@@ -81,7 +81,7 @@ let
setOutputFlags = false;
# move tools away to lighten runtime deps and size
postInstall = ''_moveToOutput bin "$bin" '';
postInstall = ''moveToOutput bin "$bin" '';
doInstallCheck = false; # fails randomly
installCheckTarget = "check"; # tests need to be run *after* installation

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

@@ -149,7 +149,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
postInstall = ''_moveToOutput bin "$bin" '';
postInstall = ''moveToOutput bin "$bin" '';
crossAttrs = let
isCygwin = stdenv.cross.libc == "msvcrt";

2
pkgs/development/libraries/libvpx/git.nix
View File

@@ -150,7 +150,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
postInstall = ''_moveToOutput bin "$bin" '';
postInstall = ''moveToOutput bin "$bin" '';
crossAttrs = let
isCygwin = stdenv.cross.libc == "msvcrt";

8
pkgs/development/libraries/libxml2/default.nix
View File

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
outputs = [ "dev" "out" "bin" "doc" "py" ];
propagatedOutputs = "out bin py";
propagatedBuildOutputs = "out bin py";
buildInputs = [ python ]
# Libxml2 has an optional dependency on liblzma. However, on impure
@@ -32,9 +32,9 @@ stdenv.mkDerivation rec {
installFlags = ''pythondir="$(py)/lib/${python.libPrefix}/site-packages"'';
postFixup = ''
_moveToOutput bin/xml2-config "$dev"
_moveToOutput lib/xml2Conf.sh "$dev"
_moveToOutput share/man/man1 "$bin"
moveToOutput bin/xml2-config "$dev"
moveToOutput lib/xml2Conf.sh "$dev"
moveToOutput share/man/man1 "$bin"
'';
passthru = { inherit version; pythonSupport = true; };

6
pkgs/development/libraries/libxslt/default.nix
View File

@@ -25,9 +25,9 @@ stdenv.mkDerivation rec {
];
postFixup = ''
_moveToOutput bin/xslt-config "$dev"
_moveToOutput lib/xsltConf.sh "$dev"
_moveToOutput share/man/man1 "$bin"
moveToOutput bin/xslt-config "$dev"
moveToOutput lib/xsltConf.sh "$dev"
moveToOutput share/man/man1 "$bin"
'';
meta = with stdenv.lib; {

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

@@ -24,7 +24,7 @@ stdenv.mkDerivation {
postInstall = ''
find $out -name "*.a" -delete
_moveToOutput share "$dev" # just aclocal
moveToOutput share "$dev" # just aclocal
'';
enableParallelBuilding = true;

6
pkgs/development/libraries/nss/default.nix
View File

@@ -77,9 +77,9 @@ in stdenv.mkDerivation rec {
LD_LIBRARY_PATH=$out/lib $out/bin/shlibsign -v -i "$libfile"
done
_moveToOutput bin "$tools"
_moveToOutput bin/nss-config "$dev"
_moveToOutput lib/libcrmf.a "$dev" # needed by firefox, for example
moveToOutput bin "$tools"
moveToOutput bin/nss-config "$dev"
moveToOutput lib/libcrmf.a "$dev" # needed by firefox, for example
rm "$out"/lib/*.a
'';

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

@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
# we are running out of stack on both freeBSDs on Hydra
postFixup = ''
_moveToOutput bin/pcre-config "$dev"
moveToOutput bin/pcre-config "$dev"
''
+ optionalString (variant != null) ''
ln -sf -t "$out/lib/" '${pcre.out}'/lib/libpcre{,posix}.so.*.*.*

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

@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
configureFlags = stdenv.lib.optional (!static) "--shared";
postInstall = ''
_moveToOutput lib/libz.a "$static"
moveToOutput lib/libz.a "$static"
''
# jww (2015-01-06): Sometimes this library install as a .so, even on
# Darwin; others time it installs as a .dylib. I haven't yet figured out