diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2017-12-27 13:45:24 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-27 13:45:24 -0800 |
| commit | ad1a1ee7dddf12dd018021d5b86ac3fbd8f95a70 (patch) | |
| tree | 3c45b81b45044e410a8d3bbb1fe33361ce703f72 /pkgs/tools | |
| parent | 635c10140fc276469a905e2750ff9a260da52c1a (diff) | |
| parent | 558c96fe13a692b5023d959933c89df4e0c49a34 (diff) | |
| download | nixlib-ad1a1ee7dddf12dd018021d5b86ac3fbd8f95a70.tar nixlib-ad1a1ee7dddf12dd018021d5b86ac3fbd8f95a70.tar.gz nixlib-ad1a1ee7dddf12dd018021d5b86ac3fbd8f95a70.tar.bz2 nixlib-ad1a1ee7dddf12dd018021d5b86ac3fbd8f95a70.tar.lz nixlib-ad1a1ee7dddf12dd018021d5b86ac3fbd8f95a70.tar.xz nixlib-ad1a1ee7dddf12dd018021d5b86ac3fbd8f95a70.tar.zst nixlib-ad1a1ee7dddf12dd018021d5b86ac3fbd8f95a70.zip | |
Merge pull request #33087 from obsidiansystems/alt-stdenv
treewide: Clean up multi-arch tools and usage
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/ |