treewide: use $out instead of $bin with buildGoPackage
This commit is contained in:
@@ -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; {
|
||||
|
||||
Reference in New Issue
Block a user