diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-26 15:23:01 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-27 15:15:45 -0500 |
| commit | 558c96fe13a692b5023d959933c89df4e0c49a34 (patch) | |
| tree | 3067646df520d11bac31a5be78bdd0e52b0d3f59 /pkgs/tools | |
| parent | 831c71eea34de2d947037d67e94b312de17b2bfc (diff) | |
| download | nixlib-558c96fe13a692b5023d959933c89df4e0c49a34.tar nixlib-558c96fe13a692b5023d959933c89df4e0c49a34.tar.gz nixlib-558c96fe13a692b5023d959933c89df4e0c49a34.tar.bz2 nixlib-558c96fe13a692b5023d959933c89df4e0c49a34.tar.lz nixlib-558c96fe13a692b5023d959933c89df4e0c49a34.tar.xz nixlib-558c96fe13a692b5023d959933c89df4e0c49a34.tar.zst nixlib-558c96fe13a692b5023d959933c89df4e0c49a34.zip | |
treewide: Cleanup usage of multi-arch tools
- Don't needlessly force GCC - Prefer using multi-arch stdenvs to using multi-arch tools directly.
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/misc/loadlibrary/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/misc/loadlibrary/default.nix b/pkgs/tools/misc/loadlibrary/default.nix index 8540a3f785a7..bc52598ff800 100644 --- a/pkgs/tools/misc/loadlibrary/default.nix +++ b/pkgs/tools/misc/loadlibrary/default.nix @@ -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/ |