treewide: Cleanup usage of multi-arch tools

- Don't needlessly force GCC - Prefer using multi-arch stdenvs to using multi-arch tools directly.
2017-12-27 15:15:45 -05:00
parent 831c71eea3
commit 558c96fe13
3 changed files with 9 additions and 13 deletions
@@ -1,4 +1,4 @@
-{ cabextract, glibc_multi, fetchFromGitHub, readline, stdenv_32bit }:
+{ cabextract, fetchFromGitHub, readline, stdenv_32bit }:

 # stdenv_32bit is needed because the program depends upon 32-bit libraries and does not have
 # support for 64-bit yet: it requires libc6-dev:i386, libreadline-dev:i386.
@@ -14,7 +14,7 @@ stdenv_32bit.mkDerivation rec {
    sha256 = "01hb7wzfh1s5b8cvmrmr1gqknpq5zpzj9prq3wrpsgg129jpsjkb";
  };

-  buildInputs = [ glibc_multi cabextract readline stdenv_32bit.cc.libc ];
+  buildInputs = [ cabextract readline ];

  installPhase = ''
    mkdir -p $out/bin/