Skip to content

Commit

Permalink
nvidia-docker: remove ldconf patch (fixes #93511)
Browse files Browse the repository at this point in the history
  • Loading branch information
Philipp-M committed Jul 29, 2020
1 parent ea12871 commit 40caa63
Showing 1 changed file with 1 addition and 13 deletions.
14 changes: 1 addition & 13 deletions pkgs/applications/virtualization/nvidia-docker/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 = {
Expand Down

0 comments on commit 40caa63

Please sign in to comment.