pyrox.dev / nixpkgs
lol
fork atom

nvidia-x11: Remove runtime dependency on linux.dev

Eelco Dolstra 165406e1 1bb59f2c

+8 -4
unified split
+4 -2
pkgs/os-specific/linux/nvidia-x11/builder.sh
··· 47 48 # Install the kernel module. 49 mkdir -p $out/lib/modules/$kernelVersion/misc 50 - cp kernel/nvidia.ko $out/lib/modules/$kernelVersion/misc 51 - cp kernel/uvm/nvidia-uvm.ko $out/lib/modules/$kernelVersion/misc 52 fi 53 54 # All libs except GUI-only are in $out now, so fixup them.
··· 47 48 # Install the kernel module. 49 mkdir -p $out/lib/modules/$kernelVersion/misc 50 + for i in kernel/nvidia.ko kernel/uvm/nvidia-uvm.ko; do 51 + nuke-refs $i 52 + cp $i $out/lib/modules/$kernelVersion/misc/ 53 + done 54 fi 55 56 # All libs except GUI-only are in $out now, so fixup them.
+4 -2
pkgs/os-specific/linux/nvidia-x11/default.nix
··· 1 { stdenv, fetchurl, kernel ? null, xlibs, zlib, perl 2 - , gtk, atk, pango, glib, gdk_pixbuf, cairo 3 , # Whether to build the libraries only (i.e. not the kernel module or 4 # nvidia-settings). Used to support 32-bit binaries on 64-bit 5 # Linux. ··· 52 [ gtk atk pango glib gdk_pixbuf cairo ] ); 53 programPath = makeLibraryPath [ xlibs.libXv ]; 54 55 - buildInputs = [ perl ]; 56 57 meta = with stdenv.lib.meta; { 58 homepage = http://www.nvidia.com/object/unix.html;
··· 1 { stdenv, fetchurl, kernel ? null, xlibs, zlib, perl 2 + , gtk, atk, pango, glib, gdk_pixbuf, cairo, nukeReferences 3 , # Whether to build the libraries only (i.e. not the kernel module or 4 # nvidia-settings). Used to support 32-bit binaries on 64-bit 5 # Linux. ··· 52 [ gtk atk pango glib gdk_pixbuf cairo ] ); 53 programPath = makeLibraryPath [ xlibs.libXv ]; 54 55 + buildInputs = [ perl nukeReferences ]; 56 + 57 + disallowedReferences = if libsOnly then [] else [ kernel.dev ]; 58 59 meta = with stdenv.lib.meta; { 60 homepage = http://www.nvidia.com/object/unix.html;