cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #94199 from Philipp-M/fix-nvidia-docker-glibc-ldconfig-patch

Browse source 
nvidia-docker: remove ldconf patch (fixes #93511)
This commit is contained in:
Mario Rodas 2020-07-29 21:48:15 -05:00 committed by GitHub
commit 777156869c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/applications/virtualization/nvidia-docker/default.nix
View file

@ -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 = {