treewide: Cleanup usage of multi-arch tools

- Don't needlessly force GCC

 - Prefer using multi-arch stdenvs to using multi-arch tools directly.
This commit is contained in:
John Ericson
2017-12-27 15:15:45 -05:00
parent 831c71eea3
commit 558c96fe13
3 changed files with 9 additions and 13 deletions
+4 -6
View File
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, gcc_multi, glibc_multi }:
{ multiStdenv, fetchurl }:
let version = "1.7.4"; in
stdenv.mkDerivation {
multiStdenv.mkDerivation {
name = "statifier-${version}";
src = fetchurl {
@@ -9,16 +9,14 @@ stdenv.mkDerivation {
sha256 = "03lzkla6knjhh186b43cac410x2fmhi28pkmzb3d211n3zp5i9y8";
};
buildInputs = [ gcc_multi glibc_multi ];
phaseNames = [ "patchPhase" "installPhase" ];
postPatch = ''
sed -e s@/usr/@"$out/"@g -i */Makefile src/statifier
sed -e s@/bin/bash@"${stdenv.shell}"@g -i src/*.sh
sed -e s@/bin/bash@"${multiStdenv.shell}"@g -i src/*.sh
'';
meta = with stdenv.lib; {
meta = with multiStdenv.lib; {
description = "Tool for creating static Linux binaries";
platforms = platforms.linux;
};