diff options
Diffstat (limited to 'nixpkgs/pkgs/os-specific/linux/nvidia-x11')
7 files changed, 489 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh new file mode 100755 index 000000000000..8882ffdd45e7 --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -0,0 +1,136 @@ +source $stdenv/setup + +unpackManually() { + skip=$(sed 's/^skip=//; t; d' $src) + tail -n +$skip $src | xz -d | tar xvf - + sourceRoot=. +} + + +unpackFile() { + sh $src -x || unpackManually +} + + +buildPhase() { + if [ -n "$bin" ]; then + # Create the module. + echo "Building linux driver against kernel: $kernel"; + cd kernel + sysSrc=$(echo $kernel/lib/modules/$kernelVersion/source) + sysOut=$(echo $kernel/lib/modules/$kernelVersion/build) + unset src # used by the nv makefile + make SYSSRC=$sysSrc SYSOUT=$sysOut module -j$NIX_BUILD_CORES + + cd .. + fi +} + + +installPhase() { + # Install libGL and friends. + + # since version 391, 32bit libraries are bundled in the 32/ sub-directory + if [ "$i686bundled" = "1" ]; then + mkdir -p "$lib32/lib" + cp -prd 32/*.so.* 32/tls "$lib32/lib/" + fi + + mkdir -p "$out/lib" + cp -prd *.so.* tls "$out/lib/" + + for i in $lib32 $out; do + rm -f $i/lib/lib{glx,nvidia-wfb}.so.* # handled separately + rm -f $i/lib/libnvidia-gtk* # built from source + if [ "$useGLVND" = "1" ]; then + # Pre-built libglvnd + rm $i/lib/lib{GL,GLX,EGL,GLESv1_CM,GLESv2,OpenGL,GLdispatch}.so.* + fi + # Use ocl-icd instead + rm -f $i/lib/libOpenCL.so* + # Move VDPAU libraries to their place + mkdir $i/lib/vdpau + mv $i/lib/libvdpau* $i/lib/vdpau + + # Install ICDs. + install -Dm644 nvidia.icd $i/etc/OpenCL/vendors/nvidia.icd + if [ -e nvidia_icd.json.template ]; then + sed "s#__NV_VK_ICD__#libGLX_nvidia.so#" nvidia_icd.json.template > nvidia_icd.json + install -Dm644 nvidia_icd.json $i/share/vulkan/icd.d/nvidia.json + fi + if [ "$useGLVND" = "1" ]; then + install -Dm644 10_nvidia.json $i/share/glvnd/egl_vendor.d/nvidia.json + fi + + done + + + if [ -n "$bin" ]; then + # Install the X drivers. + mkdir -p $bin/lib/xorg/modules + cp -p libnvidia-wfb.* $bin/lib/xorg/modules/ + mkdir -p $bin/lib/xorg/modules/drivers + cp -p nvidia_drv.so $bin/lib/xorg/modules/drivers + mkdir -p $bin/lib/xorg/modules/extensions + cp -p libglx*.so* $bin/lib/xorg/modules/extensions + + # Install the kernel module. + mkdir -p $bin/lib/modules/$kernelVersion/misc + for i in $(find ./kernel -name '*.ko'); do + nuke-refs $i + cp $i $bin/lib/modules/$kernelVersion/misc/ + done + + # Install application profiles. + if [ "$useProfiles" = "1" ]; then + mkdir -p $bin/share/nvidia + cp nvidia-application-profiles-*-rc $bin/share/nvidia/nvidia-application-profiles-rc + cp nvidia-application-profiles-*-key-documentation $bin/share/nvidia/nvidia-application-profiles-key-documentation + fi + fi + + # All libs except GUI-only are installed now, so fixup them. + for libname in $(find "$out/lib/" $(test -n "$lib32" && echo "$lib32/lib/") $(test -n "$bin" && echo "$bin/lib/") -name '*.so.*') + do + # I'm lazy to differentiate needed libs per-library, as the closure is the same. + # Unfortunately --shrink-rpath would strip too much. + patchelf --set-rpath "$out/lib:$libPath" "$libname" + + libname_short=`echo -n "$libname" | sed 's/so\..*/so/'` + + if [[ "$libname" != "$libname_short" ]]; then + ln -srnf "$libname" "$libname_short" + fi + + if [[ $libname_short =~ libEGL.so || $libname_short =~ libEGL_nvidia.so || $libname_short =~ libGLX.so || $libname_short =~ libGLX_nvidia.so ]]; then + major=0 + else + major=1 + fi + + if [[ "$libname" != "$libname_short.$major" ]]; then + ln -srnf "$libname" "$libname_short.$major" + fi + done + + if [ -n "$bin" ]; then + # Install /share files. + mkdir -p $bin/share/man/man1 + cp -p *.1.gz $bin/share/man/man1 + rm -f $bin/share/man/man1/{nvidia-xconfig,nvidia-settings,nvidia-persistenced}.1.gz + + # Install the programs. + for i in nvidia-cuda-mps-control nvidia-cuda-mps-server nvidia-smi nvidia-debugdump; do + if [ -e "$i" ]; then + install -Dm755 $i $bin/bin/$i + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath $out/lib:$libPath $bin/bin/$i + fi + done + # FIXME: needs PATH and other fixes + # install -Dm755 nvidia-bug-report.sh $bin/bin/nvidia-bug-report.sh + fi +} + + +genericBuild diff --git a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix new file mode 100644 index 000000000000..90efb9bda52f --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -0,0 +1,80 @@ +{ lib, callPackage, fetchurl, stdenv }: + +let + generic = args: callPackage (import ./generic.nix args) { }; + kernel = callPackage # a hacky way of extracting parameters from callPackage + ({ kernel, libsOnly ? false }: if libsOnly then { } else kernel) { }; + + maybePatch_drm_legacy = + lib.optional (lib.versionOlder "4.14" (kernel.version or "0")) + (fetchurl { + url = "https://raw.githubusercontent.com/MilhouseVH/LibreELEC.tv/b5d2d6a1" + + "/packages/x11/driver/xf86-video-nvidia-legacy/patches/" + + "xf86-video-nvidia-legacy-0010-kernel-4.14.patch"; + sha256 = "18clfpw03g8dxm61bmdkmccyaxir3gnq451z6xqa2ilm3j820aa5"; + }); +in +rec { + # Policy: use the highest stable version as the default (on our master). + stable = if stdenv.hostPlatform.system != "x86_64-linux" + then legacy_390 + else generic { + version = "410.78"; + sha256_64bit = "1ciabnmvh95gsfiaakq158x2yws3m9zxvnxws3p32lz9riblpdjx"; + settingsSha256 = "1677g7rcjbcs5fja1s4p0syhhz46g9x2qqzyn3wwwrjsj7rwaz77"; + persistencedSha256 = "01kvd3zp056i4n8vazj7gx1xw0h4yjdlpazmspnsmwg24ijb82x4"; + }; + + # No active beta right now + beta = stable; + + # Last one supporting x86 + legacy_390 = generic { + version = "390.87"; + sha256_32bit = "0rlr1f4lnpb8c4qz4w5r8xw5gdy9bzz26qww45qyl1qav3wwaaaw"; + sha256_64bit = "07k1kq8lkgbvjyr2dnbxcz6nppcwpq17wf925w8kfq78345hla9q"; + settingsSha256 = "0xlaiy7jr95z0v2c6cwll89nxnb142pybw7m08jg44r7n13ffv3r"; + persistencedSha256 = "0mhwk321garyl6m12261cj03ycv0qz1sbrlbq6cqwjpq4f1s7h58"; + + patches = lib.optional (kernel.meta.branch == "4.19") ./drm_mode_connector.patch; + }; + + legacy_340 = generic { + version = "340.107"; + sha256_32bit = "0mh83affz6bim26ws7kkwwcfj2s6vkdy4d45hifsbshr82qd52wd"; + sha256_64bit = "0pv9yv3x0kg9hfkmc50xb54ahxkbnyy2vyy4hj2h0s6m9sb5kqz3"; + settingsSha256 = "1rgaa24acdyqa1rqrx56293vxpskr792njqqpigqmps04llsx703"; + persistencedSha256 = "0nwv6kh4gxgy80x1zs6gcg5hy3amg25xhsfa2v4mwqa36sblxz6l"; + useGLVND = false; + + patches = [ ./vm_operations_struct-fault.patch ]; + }; + + legacy_304 = generic { + version = "304.137"; + sha256_32bit = "1y34c2gvmmacxk2c72d4hsysszncgfndc4s1nzldy2q9qagkg66a"; + sha256_64bit = "1qp3jv6279k83k3z96p6vg3dd35y9bhmlyyyrkii7sib7bdmc7zb"; + settingsSha256 = "0i5znfq6jkabgi8xpcy12pdpww6a67i8mq60z1kjq36mmnb25pmi"; + persistencedSha256 = null; + useGLVND = false; + useProfiles = false; + settings32Bit = true; + + prePatch = let + debPatches = fetchurl { + url = "mirror://debian/pool/non-free/n/nvidia-graphics-drivers-legacy-304xx/" + + "nvidia-graphics-drivers-legacy-304xx_304.137-5.debian.tar.xz"; + sha256 = "0n8512mfcnvklfbg8gv4lzbkm3z6nncwj6ix2b8ngdkmc04f3b6l"; + }; + prefix = "debian/module/debian/patches"; + applyPatches = pnames: if pnames == [] then null else + '' + tar xf '${debPatches}' + sed 's|^\([+-]\{3\} [ab]\)/|\1/kernel/|' -i ${prefix}/*.patch + patches="$patches ${lib.concatMapStringsSep " " (pname: "${prefix}/${pname}.patch") pnames}" + ''; + in applyPatches [ "fix-typos" ]; + patches = maybePatch_drm_legacy; + broken = stdenv.lib.versionAtLeast kernel.version "4.18"; + }; +} diff --git a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/drm_mode_connector.patch b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/drm_mode_connector.patch new file mode 100644 index 000000000000..58cf06fae45f --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/drm_mode_connector.patch @@ -0,0 +1,24 @@ +diff -ura a/kernel/nvidia-drm/nvidia-drm-connector.c b/kernel/nvidia-drm/nvidia-drm-connector.c +--- a/kernel/nvidia-drm/nvidia-drm-connector.c 2018-09-07 17:38:31.807453997 -0400 ++++ b/kernel/nvidia-drm/nvidia-drm-connector.c 2018-09-07 17:39:22.446185824 -0400 +@@ -226,7 +226,7 @@ + + + if (nv_connector->edid != NULL) { +- drm_mode_connector_update_edid_property( ++ drm_connector_update_edid_property( + connector, nv_connector->edid); + } + +diff -ura a/kernel/nvidia-drm/nvidia-drm-encoder.c b/kernel/nvidia-drm/nvidia-drm-encoder.c +--- a/kernel/nvidia-drm/nvidia-drm-encoder.c 2018-09-07 17:38:31.807453997 -0400 ++++ b/kernel/nvidia-drm/nvidia-drm-encoder.c 2018-09-07 17:39:35.083798484 -0400 +@@ -216,7 +216,7 @@ + + /* Attach encoder and connector */ + +- ret = drm_mode_connector_attach_encoder(connector, encoder); ++ ret = drm_connector_attach_encoder(connector, encoder); + + if (ret != 0) { + NV_DRM_DEV_LOG_ERR( diff --git a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix new file mode 100644 index 000000000000..be378d66caf9 --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -0,0 +1,99 @@ +{ version +, sha256_32bit ? null +, sha256_64bit +, settingsSha256 +, persistencedSha256 +, useGLVND ? true +, useProfiles ? true +, preferGtk2 ? false +, settings32Bit ? false + +, prePatch ? "" +, patches ? [] +, broken ? false +}: + +{ stdenv, callPackage, pkgsi686Linux, fetchurl +, kernel ? null, xorg, zlib, perl, nukeReferences +, # Whether to build the libraries only (i.e. not the kernel module or + # nvidia-settings). Used to support 32-bit binaries on 64-bit + # Linux. + libsOnly ? false +}: + +with stdenv.lib; + +assert !libsOnly -> kernel != null; +assert versionOlder version "391" -> sha256_32bit != null; +assert ! versionOlder version "391" -> stdenv.hostPlatform.system == "x86_64-linux"; + +let + nameSuffix = optionalString (!libsOnly) "-${kernel.version}"; + pkgSuffix = optionalString (versionOlder version "304") "-pkg0"; + i686bundled = versionAtLeast version "391"; + + + self = stdenv.mkDerivation { + name = "nvidia-x11-${version}${nameSuffix}"; + + builder = ./builder.sh; + + src = + if stdenv.hostPlatform.system == "x86_64-linux" then + fetchurl { + url = "https://download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run"; + sha256 = sha256_64bit; + } + else if stdenv.hostPlatform.system == "i686-linux" then + fetchurl { + url = "https://download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}${pkgSuffix}.run"; + sha256 = sha256_32bit; + } + else throw "nvidia-x11 does not support platform ${stdenv.hostPlatform.system}"; + + patches = if libsOnly then null else patches; + inherit prePatch; + inherit version useGLVND useProfiles; + inherit (stdenv.hostPlatform) system; + inherit i686bundled; + + outputs = [ "out" ] + ++ optional i686bundled "lib32" + ++ optional (!libsOnly) "bin"; + outputDev = if libsOnly then null else "bin"; + + kernel = if libsOnly then null else kernel.dev; + kernelVersion = if libsOnly then null else kernel.modDirVersion; + + hardeningDisable = [ "pic" "format" ]; + + dontStrip = true; + dontPatchELF = true; + + libPath = makeLibraryPath [ xorg.libXext xorg.libX11 xorg.libXv xorg.libXrandr xorg.libxcb zlib stdenv.cc.cc ]; + + nativeBuildInputs = [ perl nukeReferences ] + ++ optionals (!libsOnly) kernel.moduleBuildDependencies; + + disallowedReferences = optional (!libsOnly) [ kernel.dev ]; + + passthru = { + settings = (if settings32Bit then pkgsi686Linux.callPackage else callPackage) (import ./settings.nix self settingsSha256) { + withGtk2 = preferGtk2; + withGtk3 = !preferGtk2; + }; + persistenced = mapNullable (hash: callPackage (import ./persistenced.nix self hash) { }) persistencedSha256; + }; + + meta = with stdenv.lib; { + homepage = http://www.nvidia.com/object/unix.html; + description = "X.org driver and kernel module for NVIDIA graphics cards"; + license = licenses.unfreeRedistributable; + platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = [ maintainers.vcunat ]; + priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so" + inherit broken; + }; + }; + +in self diff --git a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/persistenced.nix new file mode 100644 index 000000000000..474d3a69119c --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/persistenced.nix @@ -0,0 +1,30 @@ +nvidia_x11: sha256: + +{ stdenv, fetchurl, m4 }: + +stdenv.mkDerivation rec { + name = "nvidia-persistenced-${nvidia_x11.version}"; + inherit (nvidia_x11) version; + + src = fetchurl { + url = "https://download.nvidia.com/XFree86/nvidia-persistenced/${name}.tar.bz2"; + inherit sha256; + }; + + nativeBuildInputs = [ m4 ]; + + installFlags = [ "PREFIX=$(out)" ]; + + postFixup = '' + patchelf --set-rpath "$(patchelf --print-rpath $out/bin/nvidia-persistenced):${nvidia_x11}/lib" \ + $out/bin/nvidia-persistenced + ''; + + meta = with stdenv.lib; { + homepage = http://www.nvidia.com/object/unix.html; + description = "Settings application for NVIDIA graphics cards"; + license = licenses.unfreeRedistributable; + platforms = nvidia_x11.meta.platforms; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix new file mode 100644 index 000000000000..e2ef51da3803 --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -0,0 +1,89 @@ +nvidia_x11: sha256: + +{ stdenv, lib, fetchurl, pkgconfig, m4, jansson, gtk2, dbus, gtk3, libXv, libXrandr, libXext, libXxf86vm, libvdpau +, librsvg, wrapGAppsHook +, withGtk2 ? false, withGtk3 ? true +}: + +let + src = fetchurl { + url = "https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${nvidia_x11.version}.tar.bz2"; + inherit sha256; + }; + + libXNVCtrl = stdenv.mkDerivation { + name = "libXNVCtrl-${nvidia_x11.version}"; + inherit (nvidia_x11) version; + inherit src; + + buildInputs = [ libXrandr libXext ]; + + preBuild = '' + cd src/libXNVCtrl + ''; + + installPhase = '' + mkdir -p $out/lib + mkdir -p $out/include/NVCtrl + + cp libXNVCtrl.a $out/lib + cp NVCtrl.h $out/include/NVCtrl + cp NVCtrlLib.h $out/include/NVCtrl + ''; + }; + +in + +stdenv.mkDerivation rec { + name = "nvidia-settings-${nvidia_x11.version}"; + inherit (nvidia_x11) version; + inherit src; + + nativeBuildInputs = [ pkgconfig m4 ]; + + buildInputs = [ jansson libXv libXrandr libXext libXxf86vm libvdpau nvidia_x11 gtk2 dbus ] + ++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook ]; + + makeFlags = [ "NV_USE_BUNDLED_LIBJANSSON=0" ]; + installFlags = [ "PREFIX=$(out)" ]; + + postPatch = lib.optionalString nvidia_x11.useProfiles '' + sed -i 's,/usr/share/nvidia/,${nvidia_x11.bin}/share/nvidia/,g' src/gtk+-2.x/ctkappprofile.c + ''; + + preBuild = '' + if [ -e src/libXNVCtrl/libXNVCtrl.a ]; then + ( cd src/libXNVCtrl + make + ) + fi + ''; + + postInstall = '' + ${lib.optionalString (!withGtk2) '' + rm -f $out/lib/libnvidia-gtk2.so.* + ''} + ${lib.optionalString (!withGtk3) '' + rm -f $out/lib/libnvidia-gtk3.so.* + ''} + ''; + + binaryName = if withGtk3 then ".nvidia-settings-wrapped" else "nvidia-settings"; + + postFixup = '' + patchelf --set-rpath "$(patchelf --print-rpath $out/bin/$binaryName):$out/lib:${libXv}/lib" \ + $out/bin/$binaryName + ''; + + passthru = { + inherit libXNVCtrl; + }; + + meta = with stdenv.lib; { + homepage = http://www.nvidia.com/object/unix.html; + description = "Settings application for NVIDIA graphics cards"; + license = licenses.unfreeRedistributable; + platforms = nvidia_x11.meta.platforms; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/vm_operations_struct-fault.patch b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/vm_operations_struct-fault.patch new file mode 100644 index 000000000000..6ce5c1205e2d --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/vm_operations_struct-fault.patch @@ -0,0 +1,31 @@ +https://devtalk.nvidia.com/default/topic/1025051/fully-working-patches-2-of-them-for-nvidia-driver-340-104-compiler-installer-file-and-linux-kernels-4-13-amp-4-14/?offset=5 +--- a/kernel/uvm/nvidia_uvm_lite.c ++++ b/kernel/uvm/nvidia_uvm_lite.c +@@ -818,8 +818,15 @@ done: + } + + #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) + int _fault(struct vm_area_struct *vma, struct vm_fault *vmf) ++#else ++int _fault(struct vm_fault *vmf) ++#endif + { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) ++ struct vm_area_struct *vma = vmf->vma; ++#endif + #if defined(NV_VM_FAULT_HAS_ADDRESS) + unsigned long vaddr = vmf->address; + #else +@@ -866,7 +873,11 @@ static struct vm_operations_struct uvmlite_vma_ops = + // it's dealing with anonymous mapping (see handle_pte_fault). + // + #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) + int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf) ++#else ++int _sigbus_fault(struct vm_fault *vmf) ++#endif + { + vmf->page = NULL; + return VM_FAULT_SIGBUS; |