diff options
| author | Luca Bruno <lethalman88@gmail.com> | 2015-12-02 10:03:23 +0100 |
|---|---|---|
| committer | Luca Bruno <lethalman88@gmail.com> | 2015-12-02 10:05:36 +0100 |
| commit | e289717414ae4e730586563122591a68820f7c25 (patch) | |
| tree | e5584b51145fbc36b960abcdf78647ec8cb99650 /pkgs/servers | |
| parent | 0d2ac2b08c6e9a1f51de541b85ee0322423331c1 (diff) | |
| download | nixpkgs-e289717414ae4e730586563122591a68820f7c25.tar nixpkgs-e289717414ae4e730586563122591a68820f7c25.tar.gz nixpkgs-e289717414ae4e730586563122591a68820f7c25.tar.bz2 nixpkgs-e289717414ae4e730586563122591a68820f7c25.tar.lz nixpkgs-e289717414ae4e730586563122591a68820f7c25.tar.xz nixpkgs-e289717414ae4e730586563122591a68820f7c25.tar.zst nixpkgs-e289717414ae4e730586563122591a68820f7c25.zip | |
rename moveToOutput and propagatedBuildInputs
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/pulseaudio/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/sql/postgresql/default.nix | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 47edd751887..66ed31bab7b 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { rm -rf $out/{bin,share,etc,lib/{pulse-*,systemd}} sed 's|-lltdl|-L${libtool.lib}/lib -lltdl|' -i $out/lib/libpulsecore-${version}.la '' - + ''_moveToOutput lib/cmake "$dev" ''; + + ''moveToOutput lib/cmake "$dev" ''; meta = { description = "Sound server for POSIX and Win32 systems"; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 1743aa2df4b..fdd35637e57 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -40,9 +40,9 @@ let postInstall = '' - _moveToOutput "lib/pgxs" "$out" # looks strange, but not deleting it - _moveToOutput "lib/*.a" "$out" - _moveToOutput "lib/libecpg*" "$out" + moveToOutput "lib/pgxs" "$out" # looks strange, but not deleting it + moveToOutput "lib/*.a" "$out" + moveToOutput "lib/libecpg*" "$out" # Prevent a retained dependency on gcc-wrapper. substituteInPlace "$out/lib/pgxs/src/Makefile.global" --replace ${stdenv.cc}/bin/ld ld |