diff options
author | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-04-28 11:50:57 +1000 |
---|---|---|
committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-04-28 20:30:29 +1000 |
commit | b5dc07a4b471e6f651af3b13e4bd841b6b3ea6ed (patch) | |
tree | 77df5bd7e3c972e12a022ca5fc437c8f67ce9092 /pkgs/applications/virtualization/singularity | |
parent | c59c4e358989ce49afd177e6899549fbb8f8bf7f (diff) |
treewide: use $out instead of $bin with buildGoPackage
Diffstat (limited to 'pkgs/applications/virtualization/singularity')
-rw-r--r-- | pkgs/applications/virtualization/singularity/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index 4477e7c7b1d5..f6a1a3bc6a91 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -42,7 +42,7 @@ buildGoPackage rec { patchShebangs . sed -i 's|defaultPath := "[^"]*"|defaultPath := "${stdenv.lib.makeBinPath propagatedBuildInputs}"|' cmd/internal/cli/actions.go - ./mconfig -V ${version} -p $bin --localstatedir=/var + ./mconfig -V ${version} -p $out --localstatedir=/var # Don't install SUID binaries sed -i 's/-m 4755/-m 755/g' builddir/Makefile @@ -54,16 +54,16 @@ buildGoPackage rec { ''; installPhase = '' - make -C builddir install LOCALSTATEDIR=$bin/var - chmod 755 $bin/libexec/singularity/bin/starter-suid - wrapProgram $bin/bin/singularity --prefix PATH : ${stdenv.lib.makeBinPath propagatedBuildInputs} + make -C builddir install LOCALSTATEDIR=$out/var + chmod 755 $out/libexec/singularity/bin/starter-suid + wrapProgram $out/bin/singularity --prefix PATH : ${stdenv.lib.makeBinPath propagatedBuildInputs} ''; postFixup = '' - find $bin/ -type f -executable -exec remove-references-to -t ${go} '{}' + || true + find $out/libexec/ -type f -executable -exec remove-references-to -t ${go} '{}' + || true # These etc scripts shouldn't have their paths patched - cp etc/actions/* $bin/etc/singularity/actions/ + cp etc/actions/* $out/etc/singularity/actions/ ''; meta = with stdenv.lib; { |