diff options
| author | Philipp Mildenberger <philipp.mildenberger@koeln.de> | 2020-07-30 00:36:30 +0200 |
|---|---|---|
| committer | Philipp Mildenberger <philipp.mildenberger@koeln.de> | 2020-07-30 00:36:30 +0200 |
| commit | 40caa633aa457978fb9eadb027da7d7157e8d813 (patch) | |
| tree | 8a22b507ed722c1b1e94b524af5ba1fcfed8ff7f /pkgs/applications/virtualization/nvidia-docker | |
| parent | ea1287110f3fa124d31e59520f5c248029bd74da (diff) | |
| download | nixlib-40caa633aa457978fb9eadb027da7d7157e8d813.tar nixlib-40caa633aa457978fb9eadb027da7d7157e8d813.tar.gz nixlib-40caa633aa457978fb9eadb027da7d7157e8d813.tar.bz2 nixlib-40caa633aa457978fb9eadb027da7d7157e8d813.tar.lz nixlib-40caa633aa457978fb9eadb027da7d7157e8d813.tar.xz nixlib-40caa633aa457978fb9eadb027da7d7157e8d813.tar.zst nixlib-40caa633aa457978fb9eadb027da7d7157e8d813.zip | |
nvidia-docker: remove ldconf patch (fixes #93511)
Diffstat (limited to 'pkgs/applications/virtualization/nvidia-docker')
| -rw-r--r-- | pkgs/applications/virtualization/nvidia-docker/default.nix | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/pkgs/applications/virtualization/nvidia-docker/default.nix b/pkgs/applications/virtualization/nvidia-docker/default.nix index b56b88cf87ef..d0d7125721f8 100644 --- a/pkgs/applications/virtualization/nvidia-docker/default.nix +++ b/pkgs/applications/virtualization/nvidia-docker/default.nix @@ -3,18 +3,6 @@ with lib; let - glibc-ldconf = glibc.overrideAttrs (oldAttrs: { - # ldconfig needs help reading libraries that have been patchelf-ed, as the - # .dynstr section is no longer in the first LOAD segment. See also - # https://sourceware.org/bugzilla/show_bug.cgi?id=23964 and - # https://github.com/NixOS/patchelf/issues/44 - patches = oldAttrs.patches ++ [ (fetchpatch { - name = "ldconfig-patchelf.patch"; - url = "https://sourceware.org/bugzilla/attachment.cgi?id=11444"; - sha256 = "0nzzmq7pli37iyjrgcmvcy92piiwjybpw245ds7q43pbgdm7lc3s"; - })]; - }); - libnvidia-container = callPackage ./libnvc.nix { }; nvidia-container-runtime = fetchFromGitHub { @@ -72,7 +60,7 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/nvidia-container-cli \ --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:/run/opengl-driver-32/lib cp ${./config.toml} $out/etc/config.toml - substituteInPlace $out/etc/config.toml --subst-var-by glibcbin ${lib.getBin glibc-ldconf} + substituteInPlace $out/etc/config.toml --subst-var-by glibcbin ${lib.getBin glibc} ''; meta = { |