Merge #12779: Mass replace pkg}/bin
-style strings
... to refer to correct outputs
This commit is contained in:
commit
54299b60c4
@ -89,8 +89,8 @@ in
|
||||
nameValuePair "xfs_quota-${name}" {
|
||||
description = "Setup xfs_quota for project ${name}";
|
||||
script = ''
|
||||
${pkgs.xfsprogs}/bin/xfs_quota -x -c 'project -s ${name}' ${opts.fileSystem}
|
||||
${pkgs.xfsprogs}/bin/xfs_quota -x -c 'limit -p ${limitOptions opts} ${name}' ${opts.fileSystem}
|
||||
${pkgs.xfsprogs.bin}/bin/xfs_quota -x -c 'project -s ${name}' ${opts.fileSystem}
|
||||
${pkgs.xfsprogs.bin}/bin/xfs_quota -x -c 'limit -p ${limitOptions opts} ${name}' ${opts.fileSystem}
|
||||
'';
|
||||
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
@ -333,7 +333,7 @@ let
|
||||
|
||||
'version' => '${config.package.version}',
|
||||
|
||||
'openssl' => '${pkgs.openssl}/bin/openssl'
|
||||
'openssl' => '${pkgs.openssl.bin}/bin/openssl'
|
||||
|
||||
);
|
||||
|
||||
|
@ -436,7 +436,7 @@ in
|
||||
${optionalString luks.yubikeySupport ''
|
||||
copy_bin_and_libs ${pkgs.ykpers}/bin/ykchalresp
|
||||
copy_bin_and_libs ${pkgs.ykpers}/bin/ykinfo
|
||||
copy_bin_and_libs ${pkgs.openssl}/bin/openssl
|
||||
copy_bin_and_libs ${pkgs.openssl.bin}/bin/openssl
|
||||
|
||||
cc -O3 -I${pkgs.openssl}/include -L${pkgs.openssl.out}/lib ${./pbkdf2-sha512.c} -o pbkdf2-sha512 -lcrypto
|
||||
strip -s pbkdf2-sha512
|
||||
|
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
||||
postFixup = ''
|
||||
for executable in $(cd $out/bin && ls); do
|
||||
wrapProgram $out/bin/$executable \
|
||||
--prefix PATH : "${bc}/bin:${findutils}/bin:${sox}/bin:${procps}/bin:${opusTools}/bin:${lame}/bin:${flac}/bin"
|
||||
--prefix PATH : "${bc}/bin:${findutils}/bin:${sox}/bin:${procps}/bin:${opusTools}/bin:${lame}/bin:${flac.bin}/bin"
|
||||
done
|
||||
'';
|
||||
|
||||
|
@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
for a in $out/bin/*; do
|
||||
wrapProgram $a --prefix PYTHONPATH : $PYTHONPATH \
|
||||
--prefix PATH : ${poppler_utils}/bin
|
||||
--prefix PATH : ${poppler_utils.out}/bin
|
||||
done
|
||||
'';
|
||||
|
||||
|
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram "$out/bin/dunst" \
|
||||
--prefix PATH : '${dbus_daemon}/bin'
|
||||
--prefix PATH : '${dbus_daemon.out}/bin'
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
@ -14,7 +14,7 @@ stdenv.mkDerivation {
|
||||
--with-mount-prog=${utillinux}/bin/mount \
|
||||
--with-umount-prog=${utillinux}/bin/umount \
|
||||
--with-losetup-prog=${utillinux}/bin/losetup \
|
||||
--with-setfacl-prog=${acl}/bin/setfacl \
|
||||
--with-setfacl-prog=${acl.bin}/bin/setfacl \
|
||||
--sysconfdir=$prefix/etc
|
||||
'';
|
||||
preConfigure = ''
|
||||
|
@ -21,7 +21,7 @@ pythonPackages.buildPythonPackage rec {
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/mailpile \
|
||||
--prefix PATH ":" "${gnupg1orig}/bin:${openssl}/bin"
|
||||
--prefix PATH ":" "${gnupg1orig}/bin:${openssl.bin}/bin"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||
substituteInPlace $f --replace gunzip ${gzip}/bin/gunzip
|
||||
substituteInPlace $f --replace iconv ${libiconv.bin}/bin/iconv
|
||||
substituteInPlace $f --replace lyx ${lyx}/bin/lyx
|
||||
substituteInPlace $f --replace pdftotext ${poppler_utils}/bin/pdftotext
|
||||
substituteInPlace $f --replace pdftotext ${poppler_utils.out}/bin/pdftotext
|
||||
substituteInPlace $f --replace pstotext ${ghostscript}/bin/ps2ascii
|
||||
substituteInPlace $f --replace sed ${gnused}/bin/sed
|
||||
substituteInPlace $f --replace tar ${gnutar}/bin/tar
|
||||
|
@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postPatch = ''
|
||||
sed -e 's|"gzip"|"${gzip}/bin/gzip"|' \
|
||||
-e 's|"bzip2"|"${bzip2}/bin/bzip2"|' \
|
||||
-e 's|"xz"|"${xz}/bin/xz"|' \
|
||||
-e 's|"bzip2"|"${bzip2.bin}/bin/bzip2"|' \
|
||||
-e 's|"xz"|"${xz.bin}/bin/xz"|' \
|
||||
-i ui-snapshot.c
|
||||
'';
|
||||
|
||||
|
@ -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
|
||||
|
@ -33,7 +33,7 @@ pythonPackages.buildPythonPackage rec {
|
||||
ldap ldappool webtest requests2 oslotest pep8 pymongo which
|
||||
];
|
||||
|
||||
makeWrapperArgs = ["--prefix PATH : '${openssl}/bin:$PATH'"];
|
||||
makeWrapperArgs = ["--prefix PATH : '${openssl.bin}/bin:$PATH'"];
|
||||
|
||||
postInstall = ''
|
||||
# install .ini files
|
||||
|
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
++ stdenv.lib.optional (vaapi != null) "--enabe-vaapi-recorder"
|
||||
++ stdenv.lib.optionals (xwayland != null) [
|
||||
"--enable-xwayland"
|
||||
"--with-xserver-path=${xwayland}/bin/Xwayland"
|
||||
"--with-xserver-path=${xwayland.out}/bin/Xwayland"
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
@ -574,7 +574,7 @@ rec {
|
||||
buildCommand = ''
|
||||
${createRootFS}
|
||||
|
||||
PATH=$PATH:${dpkg}/bin:${dpkg}/bin:${glibc.bin}/bin:${lzma}/bin
|
||||
PATH=$PATH:${dpkg}/bin:${dpkg}/bin:${glibc.bin}/bin:${lzma.bin}/bin
|
||||
|
||||
# Unpack the .debs. We do this to prevent pre-install scripts
|
||||
# (which have lots of circular dependencies) from barfing.
|
||||
|
@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
|
||||
export XDG_RUNTIME_HOME="$TMP"
|
||||
export HOME="$TMP"
|
||||
export XDG_DATA_DIRS="${desktop_file_utils}/share:${shared_mime_info}/share"
|
||||
export G_TEST_DBUS_DAEMON="${dbus_daemon}/bin/dbus-daemon"
|
||||
export G_TEST_DBUS_DAEMON="${dbus_daemon.out}/bin/dbus-daemon"
|
||||
|
||||
substituteInPlace gio/tests/desktop-files/home/applications/epiphany-weather-for-toronto-island-9c6a4e022b17686306243dada811d550d25eb1fb.desktop --replace "Exec=/bin/true" "Exec=${coreutils}/bin/true"
|
||||
# Needs machine-id, comment the test
|
||||
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/sbin/opendkim-genkey \
|
||||
--prefix PATH : ${openssl}/bin
|
||||
--prefix PATH : ${openssl.bin}/bin
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
JSONPP
|
||||
TermReadKey
|
||||
]}" \
|
||||
--prefix PATH : "${openssl}/bin"
|
||||
--prefix PATH : "${openssl.bin}/bin"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
preConfigure = ''
|
||||
export PATH_CP=$(type -tp cp)
|
||||
export PATH_CHKCONFIG=/no-such-program
|
||||
export BZIP=${bzip2}/bin/bzip2
|
||||
export BZIP=${bzip2.bin}/bin/bzip2
|
||||
export SYSTEMCTL=systemctl
|
||||
'';
|
||||
|
||||
|
@ -15,11 +15,11 @@ stdenv.mkDerivation rec {
|
||||
--replace @coreutils@ "${coreutils}/bin" \
|
||||
--replace @findutils@ "${findutils}/bin" \
|
||||
--replace @nix@ "${nix}/bin" \
|
||||
--replace @xz@ "${xz}/bin" \
|
||||
--replace @bzip2@ "${bzip2}/bin" \
|
||||
--replace @xz@ "${xz.bin}/bin" \
|
||||
--replace @bzip2@ "${bzip2.bin}/bin" \
|
||||
--replace @gnused@ "${gnused}/bin" \
|
||||
--replace @gnugrep@ "${gnugrep}/bin" \
|
||||
--replace @openssl@ "${openssl}/bin" \
|
||||
--replace @openssl@ "${openssl.bin}/bin" \
|
||||
--replace @lighttpd@ "${lighttpd}/sbin" \
|
||||
--replace @iproute@ "${iproute}/sbin" \
|
||||
--replace "xXxXx" "xXxXx"
|
||||
@ -32,11 +32,11 @@ stdenv.mkDerivation rec {
|
||||
--replace @coreutils@ "${coreutils}/bin" \
|
||||
--replace @findutils@ "${findutils}/bin" \
|
||||
--replace @nix@ "${nix}/bin" \
|
||||
--replace @xz@ "${xz}/bin" \
|
||||
--replace @bzip2@ "${bzip2}/bin" \
|
||||
--replace @xz@ "${xz.bin}/bin" \
|
||||
--replace @bzip2@ "${bzip2.bin}/bin" \
|
||||
--replace @gnused@ "${gnused}/bin" \
|
||||
--replace @gnugrep@ "${gnugrep}/bin" \
|
||||
--replace @openssl@ "${openssl}/bin" \
|
||||
--replace @openssl@ "${openssl.bin}/bin" \
|
||||
--replace @lighttpd@ "${lighttpd}/sbin" \
|
||||
--replace @iproute@ "${iproute}/sbin" \
|
||||
--replace "xXxXx" "xXxXx"
|
||||
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
substituteInPlace ./shellinabox/launcher.c --replace "/usr/games" "${openssh}/bin"
|
||||
substituteInPlace ./shellinabox/service.c --replace "/bin/login" "${shadow}/bin/login"
|
||||
substituteInPlace ./shellinabox/launcher.c --replace "/bin/login" "${shadow}/bin/login"
|
||||
substituteInPlace ./libhttp/ssl.c --replace "/usr/bin" "${openssl}/bin"
|
||||
substituteInPlace ./libhttp/ssl.c --replace "/usr/bin" "${openssl.bin}/bin"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
@ -166,7 +166,7 @@ rec {
|
||||
cp -d ${gawk}/bin/awk $out/bin
|
||||
cp ${gnutar}/bin/tar $out/bin
|
||||
cp ${gzip}/bin/gzip $out/bin
|
||||
cp ${bzip2}/bin/bzip2 $out/bin
|
||||
cp ${bzip2.bin}/bin/bzip2 $out/bin
|
||||
cp -d ${gnumake}/bin/* $out/bin
|
||||
cp -d ${patch}/bin/* $out/bin
|
||||
cp ${patchelf}/bin/* $out/bin
|
||||
|
@ -79,7 +79,7 @@ rec {
|
||||
cp -d ${gawk}/bin/awk $out/bin
|
||||
cp ${gnutar}/bin/tar $out/bin
|
||||
cp ${gzip}/bin/gzip $out/bin
|
||||
cp ${bzip2}/bin/bzip2 $out/bin
|
||||
cp ${bzip2.bin}/bin/bzip2 $out/bin
|
||||
cp -d ${gnumake}/bin/* $out/bin
|
||||
cp -d ${patch}/bin/* $out/bin
|
||||
cp ${patchelf}/bin/* $out/bin
|
||||
|
@ -121,7 +121,7 @@ in buildPythonPackage rec {
|
||||
}' beets/ui/commands.py
|
||||
'' + optionalString enableBadfiles ''
|
||||
sed -i -e '/self\.run_command(\[/ {
|
||||
s,"flac","${flac}/bin/flac",
|
||||
s,"flac","${flac.bin}/bin/flac",
|
||||
s,"mp3val","${mp3val}/bin/mp3val",
|
||||
}' beetsplug/badfiles.py
|
||||
'' + optionalString enableReplaygain ''
|
||||
|
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
||||
for p in $out/bin/*
|
||||
do wrapProgram "$p" \
|
||||
--prefix PERL5LIB ":" "${perlPackages.DBFile}/lib/perl5/site_perl" \
|
||||
--prefix PATH ":" "${which}/bin:${bzip2}/bin"
|
||||
--prefix PATH ":" "${which}/bin:${bzip2.bin}/bin"
|
||||
done
|
||||
|
||||
patchShebangs $out
|
||||
|
@ -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}\"
|
||||
'';
|
||||
|
||||
|
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
substituteInPlace jhead.c \
|
||||
--replace "\" Compiled: \"__DATE__" "" \
|
||||
--replace "jpegtran -trim" "${libjpeg}/bin/jpegtran -trim"
|
||||
--replace "jpegtran -trim" "${libjpeg.bin}/bin/jpegtran -trim"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
|
||||
install -D -m755 easyrsa3/easyrsa $out/bin/easyrsa
|
||||
substituteInPlace $out/bin/easyrsa \
|
||||
--subst-var out \
|
||||
--subst-var-by openssl ${openssl}/bin/openssl
|
||||
--subst-var-by openssl ${openssl.bin}/bin/openssl
|
||||
|
||||
# Helper utility
|
||||
cat > $out/bin/easyrsa-init <<EOF
|
||||
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp -p djvu2pdf $out/bin
|
||||
wrapProgram $out/bin/djvu2pdf --prefix PATH : ${ghostscript}/bin:${djvulibre}/bin:${which}/bin
|
||||
wrapProgram $out/bin/djvu2pdf --prefix PATH : ${ghostscript}/bin:${djvulibre.bin}/bin:${which}/bin
|
||||
|
||||
mkdir -p $out/man/man1
|
||||
cp -p djvu2pdf.1.gz $out/man/man1
|
||||
|
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
for i in $out/bin/*; do
|
||||
wrapProgram $i \
|
||||
--set EC2_HOME $out \
|
||||
--prefix PATH : ${ruby}/bin:${openssl}/bin
|
||||
--prefix PATH : ${ruby}/bin:${openssl.bin}/bin
|
||||
done
|
||||
|
||||
sed -i 's|/bin/bash|${stdenv.shell}|' $out/lib/ec2/platform/base/pipeline.rb
|
||||
|
@ -277,7 +277,7 @@ in modules // {
|
||||
doCheck = false;
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace acme_tiny.py --replace "openssl" "${pkgs.openssl}/bin/openssl"
|
||||
substituteInPlace acme_tiny.py --replace "openssl" "${pkgs.openssl.bin}/bin/openssl"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
Loading…
Reference in New Issue
Block a user