diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-27 17:20:32 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-27 17:20:32 -0500 |
| commit | b3df1562d86638ef052e6c9d0f21498f11a3e15e (patch) | |
| tree | 7a70f4558cd34853abdf967397ac998280830b2c /pkgs/tools | |
| parent | e16f887ec50ef0060de6d0ef8a59462541a28665 (diff) | |
| parent | 558c96fe13a692b5023d959933c89df4e0c49a34 (diff) | |
| download | nixlib-b3df1562d86638ef052e6c9d0f21498f11a3e15e.tar nixlib-b3df1562d86638ef052e6c9d0f21498f11a3e15e.tar.gz nixlib-b3df1562d86638ef052e6c9d0f21498f11a3e15e.tar.bz2 nixlib-b3df1562d86638ef052e6c9d0f21498f11a3e15e.tar.lz nixlib-b3df1562d86638ef052e6c9d0f21498f11a3e15e.tar.xz nixlib-b3df1562d86638ef052e6c9d0f21498f11a3e15e.tar.zst nixlib-b3df1562d86638ef052e6c9d0f21498f11a3e15e.zip | |
Merge branch 'alt-stdenv' into staging
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/ |