public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nvidia-x11: Remove runtime dependency on linux.dev

Browse Source
This commit is contained in:
Eelco Dolstra 2015-07-26 12:11:17 +02:00
parent 1bb59f2c57
commit 165406e1af
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/nvidia-x11/builder.sh
View File

@ -47,8 +47,10 @@ installPhase() {
# Install the kernel module. # Install the kernel module.
mkdir -p $out/lib/modules/$kernelVersion/misc mkdir -p $out/lib/modules/$kernelVersion/misc
cp kernel/nvidia.ko $out/lib/modules/$kernelVersion/misc for i in kernel/nvidia.ko kernel/uvm/nvidia-uvm.ko; do
cp kernel/uvm/nvidia-uvm.ko $out/lib/modules/$kernelVersion/misc nuke-refs $i
cp $i $out/lib/modules/$kernelVersion/misc/
done
fi fi
# All libs except GUI-only are in $out now, so fixup them. # All libs except GUI-only are in $out now, so fixup them.

6
pkgs/os-specific/linux/nvidia-x11/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, kernel ? null, xlibs, zlib, perl { stdenv, fetchurl, kernel ? null, xlibs, zlib, perl
, gtk, atk, pango, glib, gdk_pixbuf, cairo , gtk, atk, pango, glib, gdk_pixbuf, cairo, nukeReferences
, # Whether to build the libraries only (i.e. not the kernel module or , # Whether to build the libraries only (i.e. not the kernel module or
# nvidia-settings). Used to support 32-bit binaries on 64-bit # nvidia-settings). Used to support 32-bit binaries on 64-bit
# Linux. # Linux.
@ -52,7 +52,9 @@ stdenv.mkDerivation {
[ gtk atk pango glib gdk_pixbuf cairo ] ); [ gtk atk pango glib gdk_pixbuf cairo ] );
programPath = makeLibraryPath [ xlibs.libXv ]; programPath = makeLibraryPath [ xlibs.libXv ];
buildInputs = [ perl ]; buildInputs = [ perl nukeReferences ];
disallowedReferences = if libsOnly then [] else [ kernel.dev ];
meta = with stdenv.lib.meta; { meta = with stdenv.lib.meta; {
homepage = http://www.nvidia.com/object/unix.html; homepage = http://www.nvidia.com/object/unix.html;