From e289717414ae4e730586563122591a68820f7c25 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 2 Dec 2015 10:03:23 +0100
Subject: rename moveToOutput and propagatedBuildInputs

---
 pkgs/development/libraries/SDL/default.nix                     | 2 +-
 pkgs/development/libraries/dbus/default.nix                    | 2 +-
 pkgs/development/libraries/ffmpeg/generic.nix                  | 4 ++--
 pkgs/development/libraries/glib/default.nix                    | 2 +-
 pkgs/development/libraries/gobject-introspection/setup-hook.sh | 2 +-
 pkgs/development/libraries/gtk+/2.x.nix                        | 2 +-
 pkgs/development/libraries/icu/default.nix                     | 2 +-
 pkgs/development/libraries/libav/default.nix                   | 2 +-
 pkgs/development/libraries/libvpx/default.nix                  | 2 +-
 pkgs/development/libraries/libvpx/git.nix                      | 2 +-
 pkgs/development/libraries/libxml2/default.nix                 | 8 ++++----
 pkgs/development/libraries/libxslt/default.nix                 | 6 +++---
 pkgs/development/libraries/nspr/default.nix                    | 2 +-
 pkgs/development/libraries/nss/default.nix                     | 6 +++---
 pkgs/development/libraries/pcre/default.nix                    | 2 +-
 pkgs/development/libraries/zlib/default.nix                    | 2 +-
 16 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index 92d7779ba34..fbc446bcabc 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -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
diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 7dbc76456fd..83635d9739f 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -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/"
     '';
 
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 0b45851cc93..d2da77c7b0d 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -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
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 5fc574ededb..d7f40a3bf30 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -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|"
   '';
diff --git a/pkgs/development/libraries/gobject-introspection/setup-hook.sh b/pkgs/development/libraries/gobject-introspection/setup-hook.sh
index 78a8ccf19d3..583d8475ec3 100644
--- a/pkgs/development/libraries/gobject-introspection/setup-hook.sh
+++ b/pkgs/development/libraries/gobject-introspection/setup-hook.sh
@@ -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)
diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
index daa2cb1efb4..bc129d9f1fb 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@@ -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 = {
diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix
index bc8c62230ac..58eb2e22781 100644
--- a/pkgs/development/libraries/icu/default.nix
+++ b/pkgs/development/libraries/icu/default.nix
@@ -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;
 
diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index a3d2d3fde30..78b1eef2ccf 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -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
diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix
index c33c5d9ad01..5c593dd1f75 100644
--- a/pkgs/development/libraries/libvpx/default.nix
+++ b/pkgs/development/libraries/libvpx/default.nix
@@ -149,7 +149,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  postInstall = ''_moveToOutput bin "$bin" '';
+  postInstall = ''moveToOutput bin "$bin" '';
 
   crossAttrs = let
     isCygwin = stdenv.cross.libc == "msvcrt";
diff --git a/pkgs/development/libraries/libvpx/git.nix b/pkgs/development/libraries/libvpx/git.nix
index bfe1f9424cd..064fb807a21 100644
--- a/pkgs/development/libraries/libvpx/git.nix
+++ b/pkgs/development/libraries/libvpx/git.nix
@@ -150,7 +150,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  postInstall = ''_moveToOutput bin "$bin" '';
+  postInstall = ''moveToOutput bin "$bin" '';
 
   crossAttrs = let
     isCygwin = stdenv.cross.libc == "msvcrt";
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index af71c05a1c8..2b2b1d81a16 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -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; };
diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index dc74d8e95ee..2784093d50a 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -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; {
diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index ef4dde42597..b0261194414 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
 
   postInstall = ''
     find $out -name "*.a" -delete
-    _moveToOutput share "$dev" # just aclocal
+    moveToOutput share "$dev" # just aclocal
   '';
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 20290b4c87a..12c44c4cae0 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -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
   '';
 
diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index fa4a640bd0b..0056ac3ffac 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -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.*.*.*
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 4f2b9a594e5..9fe45996b10 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -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
-- 
cgit 1.4.1