alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

treewide: Mass replace 'xz}/bin' to refer the 'bin' output

Browse source
This commit is contained in:
Tuomas Tynkkynen 2016-02-01 20:46:28 +02:00
parent 5dfcafb205
commit e97e690244
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/version-management/git-and-tools/cgit/default.nix
View file

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
postPatch = ''
sed -e 's|"gzip"|"${gzip}/bin/gzip"|' \
-e 's|"bzip2"|"${bzip2.bin}/bin/bzip2"|' \
-e 's|"xz"|"${xz}/bin/xz"|' \
-e 's|"xz"|"${xz.bin}/bin/xz"|' \
-i ui-snapshot.c
'';

2
pkgs/applications/virtualization/docker/default.nix
View file

@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
install -Dm755 ./bundles/${version}/dynbinary/docker-${version} $out/libexec/docker/docker
install -Dm755 ./bundles/${version}/dynbinary/dockerinit-${version} $out/libexec/docker/dockerinit
makeWrapper $out/libexec/docker/docker $out/bin/docker \
--prefix PATH : "${iproute}/sbin:sbin:${iptables}/sbin:${e2fsprogs}/sbin:${xz}/bin:${utillinux}/bin:${optionalString enableLxc "${lxc}/bin"}"
--prefix PATH : "${iproute}/sbin:sbin:${iptables}/sbin:${e2fsprogs}/sbin:${xz.bin}/bin:${utillinux}/bin:${optionalString enableLxc "${lxc}/bin"}"
# systemd
install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service

4
pkgs/servers/http/nix-binary-cache/default.nix
View file

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
--replace @coreutils@ "${coreutils}/bin" \
--replace @findutils@ "${findutils}/bin" \
--replace @nix@ "${nix}/bin" \
--replace @xz@ "${xz}/bin" \
--replace @xz@ "${xz.bin}/bin" \
--replace @bzip2@ "${bzip2.bin}/bin" \
--replace @gnused@ "${gnused}/bin" \
--replace @gnugrep@ "${gnugrep}/bin" \
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
--replace @coreutils@ "${coreutils}/bin" \
--replace @findutils@ "${findutils}/bin" \
--replace @nix@ "${nix}/bin" \
--replace @xz@ "${xz}/bin" \
--replace @xz@ "${xz.bin}/bin" \
--replace @bzip2@ "${bzip2.bin}/bin" \
--replace @gnused@ "${gnused}/bin" \
--replace @gnugrep@ "${gnugrep}/bin" \

2
pkgs/tools/compression/pxz/default.nix
View file

@ -20,7 +20,7 @@ stdenv.mkDerivation {
gcc -o pxz pxz.c -llzma \
-fopenmp -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -O2 \
-DPXZ_BUILD_DATE=\"nixpkgs\" \
-DXZ_BINARY=\"${xz}/bin/xz\" \
-DXZ_BINARY=\"${xz.bin}/bin/xz\" \
-DPXZ_VERSION=\"${version}\"
'';