diff --git a/flake.lock b/flake.lock index 8ddd360..60e4d05 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1781009359, - "narHash": "sha256-w/mZkRscTatf8NWyUstli8ROzM/eopxZzi0WRjoeYkU=", + "lastModified": 1781189114, + "narHash": "sha256-5inaamLgUMWy+MOBE9ChF9QAF1o/74LFuHkI0W/9rqc=", "owner": "nix-community", "repo": "home-manager", - "rev": "c58ead12efcac436afffa93a22099a5595eb4157", + "rev": "486595d2cf49cfcd649b58a284fa11ac0e34da22", "type": "github" }, "original": { @@ -80,11 +80,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1781015510, - "narHash": "sha256-DqRzaFfLijAyd3TDilgKEjNiqJ1UVymA/seyVamoWS4=", + "lastModified": 1781208515, + "narHash": "sha256-Ke76KeYDAnm/w3OGEviATXQMFw4QnRPFS/Wj6MWqM0Y=", "owner": "nix-community", "repo": "NUR", - "rev": "961e2e196da88c8d6513bb8e9865ec5e5a6cb954", + "rev": "d66d4c98290f2b8dc3487e43bd1eb3d038039ab2", "type": "github" }, "original": { diff --git a/pkgs/apps/fbset.nix b/pkgs/apps/fbset.nix index 77f08cc..7bed14e 100644 --- a/pkgs/apps/fbset.nix +++ b/pkgs/apps/fbset.nix @@ -1,5 +1,11 @@ -{ pkgs, lib, stdenv, fetchurl, dpkg, autoPatchelfHook, perl }: - +{ + lib, + stdenv, + fetchurl, + dpkg, + autoPatchelfHook, + perl, +}: stdenv.mkDerivation rec { pname = "fbset"; @@ -13,23 +19,26 @@ stdenv.mkDerivation rec { dontBuild = true; buildInputs = [ perl ]; - nativeBuildInputs = [dpkg autoPatchelfHook]; + nativeBuildInputs = [ + dpkg + autoPatchelfHook + ]; unpackPhase = '' - dpkg -x $src . + dpkg -x $src . ''; installPhase = '' - mkdir -p $out - mv usr/bin $out - mv etc $out - mv usr/share $out - patchShebangs $out/bin/modeline2fb - ls -la $out + mkdir -p $out + mv usr/bin $out + mv etc $out + mv usr/share $out + patchShebangs $out/bin/modeline2fb + ls -la $out ''; preferLocalBuild = true; - + meta = with lib; { description = "Program to modify settings for the framebuffer devices (/dev/fb[0-9]* or /dev/fb/[0-9]*) on Linux, like depth, virtual resolution, timing parameters etc."; homepage = "https://sources.debian.org/src/fbset/"; diff --git a/pkgs/apps/games/alvr/default.nix b/pkgs/apps/games/alvr/default.nix index 3de3d84..18abb72 100644 --- a/pkgs/apps/games/alvr/default.nix +++ b/pkgs/apps/games/alvr/default.nix @@ -1,13 +1,33 @@ -{ stdenv, fetchzip, fetchurl, glib, lib, alsa-lib, gtk3, libunwind, x264, vulkan-loader, xorg, libva, libdrm, libvdpau, libbsd, libmd, xz }: +{ + stdenv, + fetchzip, + glib, + lib, + alsa-lib, + gtk3, + libunwind, + x264, + vulkan-loader, + libX11, + libXau, + libva, + libdrm, + libXdmcp, + libXfixes, + libXext, + libbsd, + libmd, + xz, +}: stdenv.mkDerivation rec { pname = "alvr"; version = "v20.5.0"; src = fetchzip { - url = "https://github.com/alvr-org/ALVR/releases/download/${version}/alvr_streamer_linux.tar.gz"; - name = "${pname}-${version}"; - sha256 ="sha256-RkUVWk+6V+5MLwsvT7/d8JVps2MLnZfUMcWi8144E0I="; - }; + url = "https://github.com/alvr-org/ALVR/releases/download/${version}/alvr_streamer_linux.tar.gz"; + name = "${pname}-${version}"; + sha256 = "sha256-RkUVWk+6V+5MLwsvT7/d8JVps2MLnZfUMcWi8144E0I="; + }; sourceRoot = "."; @@ -18,11 +38,11 @@ stdenv.mkDerivation rec { glib x264.lib vulkan-loader - xorg.libX11 - xorg.libXau - xorg.libXdmcp - xorg.libXext - xorg.libXfixes + libX11 + libXau + libXdmcp + libXext + libXfixes libva libdrm libunwind @@ -57,15 +77,15 @@ stdenv.mkDerivation rec { patchelf --set-rpath "${rpath}" $out/opt/ALVR/lib64/alvr/bin/linux64/driver_alvr_server.so sed -i "s#../../../lib64/libalvr_vulkan_layer.so#$out/opt/ALVR/lib64/libalvr_vulkan_layer.so#" $out/opt/ALVR/share/vulkan/explicit_layer.d/alvr_x86_64.json - + runHook postFixup ''; meta = with lib; { description = "ALVR - Stream VR games from your PC to your headset via Wi-Fi."; homepage = "https://github.com/alvr-org/ALVR"; - maintainers = with maintainers; []; + maintainers = [ ]; license = licenses.mit; platforms = [ "x86_64-linux" ]; }; -} \ No newline at end of file +} diff --git a/pkgs/apps/games/polymc/default.nix b/pkgs/apps/games/polymc/default.nix index b4c8925..4a72e7c 100644 --- a/pkgs/apps/games/polymc/default.nix +++ b/pkgs/apps/games/polymc/default.nix @@ -10,7 +10,6 @@ zlib, file, kdePackages, - xorg, libpulseaudio, openal, qtbase, @@ -21,6 +20,12 @@ udev, mesa-demos, quazip, + libX11, + libXext, + libXcursor, + libXrandr, + libXxf86vm, + xrandr, libGL, flite, tomlplusplus, @@ -38,29 +43,27 @@ let polymc = let binpath = lib.makeBinPath [ - xorg.xrandr + xrandr mesa-demos pciutils ]; - libpath = - with xorg; - lib.makeLibraryPath [ - glfw3-minecraft - libX11 - libXext - libXcursor - libXrandr - libXxf86vm - - libGL - vulkan-loader - - openal - libpulseaudio - udev - flite - stdenv.cc.cc.lib - ]; + libpath = lib.makeLibraryPath [ + glfw3-minecraft + libX11 + libXext + libXcursor + libXrandr + libXxf86vm + + libGL + vulkan-loader + + openal + libpulseaudio + udev + flite + stdenv.cc.cc.lib + ]; gameLibraryPath = libpath + ":${addDriverRunpath.driverLink}/lib"; in stdenv.mkDerivation rec { @@ -73,14 +76,14 @@ let hash = "sha256-ACrS7JAcLq46f8puQlfvPlRb6vk/+wuv+y1yqGQjp/I="; }) ]; - + libnbtplusplus = fetchFromGitHub { owner = "PolyMC"; repo = "libnbtplusplus"; rev = "2203af7eeb48c45398139b583615134efd8d407f"; hash = "sha256-TvVOjkUobYJD9itQYueELJX3wmecvEdCbJ0FinW2mL4="; }; - + src = fetchFromGitHub { owner = "PolyMC"; repo = "PolyMC"; @@ -116,7 +119,8 @@ let (lib.cmakeFeature "Launcher_BUILD_PLATFORM" "nixerus") (lib.cmakeFeature "Launcher_QT_VERSION_MAJOR" (lib.versions.major qtbase.version)) (lib.cmakeBool "Launcher_STRICT_DRM" strictDrm) - ] ++ lib.optionals (msaClientID != null) [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ]; + ] + ++ lib.optionals (msaClientID != null) [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ]; postPatch = '' substituteInPlace launcher/java/JavaUtils.cpp \ diff --git a/pkgs/apps/idea-community.nix b/pkgs/apps/idea-community.nix new file mode 100644 index 0000000..29812f2 --- /dev/null +++ b/pkgs/apps/idea-community.nix @@ -0,0 +1,24 @@ +{ + jetbrains, + fetchurl, + lib, +}: +(jetbrains.idea.overrideAttrs (oldAttrs: { + src = fetchurl { + url = "https://github.com/JetBrains/intellij-community/releases/download/idea%2F2026.1.3/idea-2026.1.3.tar.gz"; + hash = "sha256-VNeTjX2JL8c4iQmGt0EVz07RHX50usaIjpEuzXg9uDc="; + }; + + pname = "idea-community"; + + wmClass = "jetbrains-idea-community"; + product = "IntelliJ IDEA Community"; + productShort = "IDEA"; + + # update-script-start: version + version = "2026.1.3"; + buildNumber = "261.25134.95"; + meta = (oldAttrs.meta or {}) // { + license = lib.licenses.asl20; + }; +})) diff --git a/pkgs/apps/lh2ctrl.nix b/pkgs/apps/lh2ctrl.nix index 44e0e9c..e010eb1 100644 --- a/pkgs/apps/lh2ctrl.nix +++ b/pkgs/apps/lh2ctrl.nix @@ -1,13 +1,19 @@ -{ stdenv, python3, fetchFromGitHub, lib}: -stdenv.mkDerivation - rec { +{ + stdenv, + python3, + fetchFromGitHub, + lib, +}: +stdenv.mkDerivation rec { pname = "lh2ctrl"; version = "1.1.0"; propagatedBuildInputs = [ - (python3.withPackages (pythonPackages: with pythonPackages; [ - bluepy - ])) + (python3.withPackages ( + pythonPackages: with pythonPackages; [ + bluepy + ] + )) ]; src = fetchFromGitHub { @@ -26,4 +32,3 @@ stdenv.mkDerivation platforms = platforms.linux; }; } - diff --git a/pkgs/apps/vpk_fuse.nix b/pkgs/apps/vpk_fuse.nix index 97801ae..fc65f5b 100644 --- a/pkgs/apps/vpk_fuse.nix +++ b/pkgs/apps/vpk_fuse.nix @@ -1,7 +1,12 @@ -{ pkgs, lib, stdenv, fetchFromGitHub, fuse, pkg-config }: +{ + lib, + stdenv, + fetchFromGitHub, + fuse, + pkg-config, +}: - -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "vpk_fuse"; version = "15042023"; src = fetchFromGitHub { @@ -11,12 +16,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-HoENTIHM4Nmocoh2bxxuk1ZLsq4bSUGzeKgEufsPUJA="; }; - - buildInputs = [ fuse pkg-config]; + buildInputs = [ + fuse + pkg-config + ]; installPhase = '' - mkdir -p $out/bin - install -m 755 -D vpk_fuse $out/bin/vpk_fuse + mkdir -p $out/bin + install -m 755 -D vpk_fuse $out/bin/vpk_fuse ''; meta = with lib; { diff --git a/pkgs/default.nix b/pkgs/default.nix index 35d3b90..1184a31 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,5 +1,5 @@ { pkgs, callPackage }: -rec { +{ amdgpu-pro-libs = pkgs.lib.recurseIntoAttrs { vulkan = callPackage ./libs/amdgpu-pro-libs { }; amf = callPackage ./libs/amdgpu-pro-libs/amf.nix { }; @@ -9,7 +9,14 @@ rec { }; svt-av1-psyex = callPackage ./libs/svt-av1-psyex.nix { }; - ffmpeg_7-amf-full = (pkgs.ffmpeg_7-full.overrideAttrs (finalAttrs: previousAttrs: { configureFlags = previousAttrs.configureFlags ++ [ "--enable-amf" ]; buildInputs = previousAttrs.buildInputs ++ [ pkgs.amf-headers ]; })); + ffmpeg_7-amf-full = ( + pkgs.ffmpeg_7-full.overrideAttrs ( + finalAttrs: previousAttrs: { + configureFlags = previousAttrs.configureFlags ++ [ "--enable-amf" ]; + buildInputs = previousAttrs.buildInputs ++ [ pkgs.amf-headers ]; + } + ) + ); polymc = pkgs.qt6Packages.callPackage ./apps/games/polymc { }; @@ -20,4 +27,6 @@ rec { fbset = callPackage ./apps/fbset.nix { }; lh2ctrl = callPackage ./apps/lh2ctrl.nix { }; + + idea-oss-bin = callPackage ./apps/idea-community.nix { }; } diff --git a/pkgs/libs/amdgpu-pro-libs/amf.nix b/pkgs/libs/amdgpu-pro-libs/amf.nix index c4f3556..3cbb694 100644 --- a/pkgs/libs/amdgpu-pro-libs/amf.nix +++ b/pkgs/libs/amdgpu-pro-libs/amf.nix @@ -1,4 +1,12 @@ -{ pkgs, lib, stdenv, libdrm, dpkg, vulkan-loader, patchelf, fetchurl }: +{ + lib, + stdenv, + libdrm, + dpkg, + vulkan-loader, + patchelf, + fetchurl, +}: let sources = import ./amdgpu-src.nix { inherit fetchurl; }; @@ -7,14 +15,11 @@ stdenv.mkDerivation rec { pname = "amf-amdgpu-pro"; version = sources.version; - - src = [ sources.bit64.libamdenc-amdgpu-pro sources.bit64.amf-amdgpu-pro ]; - dontPatchELF = true; sourceRoot = "."; nativeBuildInputs = [ diff --git a/pkgs/libs/amdgpu-pro-libs/default.nix b/pkgs/libs/amdgpu-pro-libs/default.nix index 972c9b9..677baae 100644 --- a/pkgs/libs/amdgpu-pro-libs/default.nix +++ b/pkgs/libs/amdgpu-pro-libs/default.nix @@ -1,4 +1,17 @@ -{ pkgs, lib, xorg, stdenv, openssl, libdrm, zlib, dpkg, patchelf, fetchurl }: +{ + pkgs, + lib, + stdenv, + openssl, + libdrm, + zlib, + dpkg, + patchelf, + fetchurl, + libX11, + libxcb, + libxshmfence, +}: let sources = import ./amdgpu-src.nix { inherit fetchurl; }; @@ -9,9 +22,11 @@ stdenv.mkDerivation rec { pname = "amdgpu-pro-vulkan-${suffix}"; version = sources.version; - - - src = if stdenv.system == "x86_64-linux" then sources.bit64.vulkan-amdgpu-pro else sources.bit32.vulkan-amdgpu-pro; + src = + if stdenv.system == "x86_64-linux" then + sources.bit64.vulkan-amdgpu-pro + else + sources.bit32.vulkan-amdgpu-pro; dontPatchELF = true; sourceRoot = "."; @@ -23,9 +38,9 @@ stdenv.mkDerivation rec { libdrm openssl stdenv.cc.cc.lib - xorg.libX11 - xorg.libxcb - xorg.libxshmfence + libX11 + libxcb + libxshmfence zlib ]; rpath = lib.makeLibraryPath buildInputs; @@ -47,6 +62,9 @@ stdenv.mkDerivation rec { description = "AMD Proprietary Driver For Vulkan"; homepage = "https://www.amd.com"; license = licenses.unfree; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = [ + "x86_64-linux" + "i686-linux" + ]; }; } diff --git a/pkgs/libs/amdgpu-pro-libs/firmware.nix b/pkgs/libs/amdgpu-pro-libs/firmware.nix index 6fe2d5f..4b272cb 100644 --- a/pkgs/libs/amdgpu-pro-libs/firmware.nix +++ b/pkgs/libs/amdgpu-pro-libs/firmware.nix @@ -1,4 +1,9 @@ -{ pkgs, lib, stdenv, libdrm, dpkg, vulkan-loader, patchelf, fetchurl }: +{ + lib, + stdenv, + dpkg, + fetchurl, +}: let sources = import ./amdgpu-src.nix { inherit fetchurl; }; @@ -10,7 +15,7 @@ stdenv.mkDerivation rec { src = sources.bit64.amdgpu-dkms-firmware; passthru = { - vcn = stdenv.mkDerivation rec { + vcn = stdenv.mkDerivation { pname = "amdgpu-firmware-vcn"; inherit src; inherit version; @@ -22,7 +27,6 @@ stdenv.mkDerivation rec { inherit nativeBuildInputs; inherit sourceRoot; - installPhase = '' mkdir -p $out/lib/firmware/amdgpu mv lib/firmware/updates/amdgpu/vcn* $out/lib/firmware/amdgpu @@ -31,7 +35,6 @@ stdenv.mkDerivation rec { }; }; - dontFixup = true; dontBuild = true; dontPatchELF = true; diff --git a/pkgs/libs/amdgpu-pro-libs/opengl.nix b/pkgs/libs/amdgpu-pro-libs/opengl.nix index 519d152..5f85cd7 100644 --- a/pkgs/libs/amdgpu-pro-libs/opengl.nix +++ b/pkgs/libs/amdgpu-pro-libs/opengl.nix @@ -1,4 +1,24 @@ -{ pkgs, lib, systemd, xorg, mesa, stdenv, expat, openssl, libdrm, zlib, wayland, dpkg, patchelf, fetchurl }: +{ + pkgs, + lib, + systemd, + mesa, + stdenv, + expat, + openssl, + libX11, + libxcb, + libXext, + libXfixes, + libXxf86vm, + libxshmfence, + libdrm, + zlib, + wayland, + dpkg, + patchelf, + fetchurl, +}: let sources = import ./amdgpu-src.nix { inherit fetchurl; }; @@ -9,7 +29,6 @@ stdenv.mkDerivation rec { pname = "amdgpu-pro-opengl-${suffix}"; version = sources.version; - src64 = [ sources.bit64.libgl1-amdgpu-pro-oglp-dri sources.bit64.libgl1-amdgpu-pro-oglp-glx @@ -18,7 +37,6 @@ stdenv.mkDerivation rec { sources.bit64.libgles2-amdgpu-pro-oglp ]; - src32 = [ sources.bit32.libgl1-amdgpu-pro-oglp-dri sources.bit32.libgl1-amdgpu-pro-oglp-glx @@ -40,12 +58,12 @@ stdenv.mkDerivation rec { openssl expat stdenv.cc.cc.lib - xorg.libX11 - xorg.libxcb - xorg.libXext - xorg.libXfixes - xorg.libXxf86vm - xorg.libxshmfence + libX11 + libxcb + libXext + libXfixes + libXxf86vm + libxshmfence zlib wayland systemd @@ -69,6 +87,9 @@ stdenv.mkDerivation rec { description = "AMD Proprietary Driver For OpenGL"; homepage = "https://www.amd.com"; license = licenses.unfree; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = [ + "x86_64-linux" + "i686-linux" + ]; }; } diff --git a/pkgs/libs/amdgpu-pro-libs/prefixes.nix b/pkgs/libs/amdgpu-pro-libs/prefixes.nix index 2f27ccc..2c15df7 100644 --- a/pkgs/libs/amdgpu-pro-libs/prefixes.nix +++ b/pkgs/libs/amdgpu-pro-libs/prefixes.nix @@ -1,12 +1,12 @@ -{ pkgs -, pkgsi686Linux -, driversi686Linux -, stdenv -, amdgpu-pro-libs -, amdvlk -, mesa -, libGL -, with32bit ? true +{ + pkgs, + pkgsi686Linux, + driversi686Linux, + amdgpu-pro-libs, + amdvlk, + mesa, + libGL, + with32bit ? true, }: let amf-amd-pro = amdgpu-pro-libs.amf; @@ -20,67 +20,87 @@ pkgs.buildEnv { name = "amdgpu-pro-prefixes"; paths = with pkgs; [ - (writeShellScriptBin "vk_pro" - '' - export DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1=1 - export VK_ICD_FILENAMES="${vulkan-amd-pro}/share/vulkan/icd.d/amd_pro_icd64.json" - export LD_LIBRARY_PATH="${amf-amd-pro}/lib:$LD_LIBRARY_PATH" - ${(if with32bit then ''export VK_ICD_FILENAMES=$VK_ICD_FILENAMES:${vulkan-amd-pro32}/share/vulkan/icd.d/amd_pro_icd32.json'' else "")} - "$@" - '' - ) - (writeShellScriptBin "vk_amdvlk" - '' - export DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1=1 - export VK_ICD_FILENAMES="${amdvlk}/share/vulkan/icd.d/amd_icd64.json" - ${(if with32bit then ''export VK_ICD_FILENAMES=$VK_ICD_FILENAMES:${driversi686Linux.amdvlk}/share/vulkan/icd.d/amd_icd32.json'' else "")} - "$@" - '' - ) + (writeShellScriptBin "vk_pro" '' + export DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1=1 + export VK_ICD_FILENAMES="${vulkan-amd-pro}/share/vulkan/icd.d/amd_pro_icd64.json" + export LD_LIBRARY_PATH="${amf-amd-pro}/lib:$LD_LIBRARY_PATH" + ${ + ( + if with32bit then + "export VK_ICD_FILENAMES=$VK_ICD_FILENAMES:${vulkan-amd-pro32}/share/vulkan/icd.d/amd_pro_icd32.json" + else + "" + ) + } + "$@" + '') + (writeShellScriptBin "vk_amdvlk" '' + export DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1=1 + export VK_ICD_FILENAMES="${amdvlk}/share/vulkan/icd.d/amd_icd64.json" + ${ + ( + if with32bit then + "export VK_ICD_FILENAMES=$VK_ICD_FILENAMES:${driversi686Linux.amdvlk}/share/vulkan/icd.d/amd_icd32.json" + else + "" + ) + } + "$@" + '') - (writeShellScriptBin "vk_radv" - '' - export DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1=1 - export VK_ICD_FILENAMES="${mesa}/share/vulkan/icd.d/radeon_icd.x86_64.json" - ${(if with32bit then ''export VK_ICD_FILENAMES=$VK_ICD_FILENAMES:${driversi686Linux.mesa}/share/vulkan/icd.d/radeon_icd.i686.json'' else "")} - "$@" - '' - ) + (writeShellScriptBin "vk_radv" '' + export DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1=1 + export VK_ICD_FILENAMES="${mesa}/share/vulkan/icd.d/radeon_icd.x86_64.json" + ${ + ( + if with32bit then + "export VK_ICD_FILENAMES=$VK_ICD_FILENAMES:${driversi686Linux.mesa}/share/vulkan/icd.d/radeon_icd.i686.json" + else + "" + ) + } + "$@" + '') - (writeShellScriptBin "gl_pro" - '' - export __GLX_VENDOR_LIBRARY_NAME=amd - export LIBGL_DRIVERS_PATH="${oglp-amd-pro}/lib/dri" - ${(if with32bit then '' - export LD_LIBRARY_PATH="${oglp-amd-pro32}/lib:$LD_LIBRARY_PATH" - export LIBGL_DRIVERS_PATH="$LIBGL_DRIVERS_PATH:${oglp-amd-pro32}/lib/dri" - '' else "")} - export LD_LIBRARY_PATH="${oglp-amd-pro}/lib:$LD_LIBRARY_PATH" - "$@" - '' - ) - (writeShellScriptBin "gl_zink" - '' - ${(if with32bit then ''export LD_LIBRARY_PATH="${pkgsi686Linux.libGL}/lib:$LD_LIBRARY_PATH"'' else "")} - export LD_LIBRARY_PATH="${libGL}/lib:$LD_LIBRARY_PATH" - export __GLX_VENDOR_LIBRARY_NAME=mesa - export MESA_LOADER_DRIVER_OVERRIDE=zink - export GALLIUM_DRIVER=zink + (writeShellScriptBin "gl_pro" '' + export __GLX_VENDOR_LIBRARY_NAME=amd + export LIBGL_DRIVERS_PATH="${oglp-amd-pro}/lib/dri" + ${ + ( + if with32bit then + '' + export LD_LIBRARY_PATH="${oglp-amd-pro32}/lib:$LD_LIBRARY_PATH" + export LIBGL_DRIVERS_PATH="$LIBGL_DRIVERS_PATH:${oglp-amd-pro32}/lib/dri" + '' + else + "" + ) + } + export LD_LIBRARY_PATH="${oglp-amd-pro}/lib:$LD_LIBRARY_PATH" + "$@" + '') + (writeShellScriptBin "gl_zink" '' + ${ + (if with32bit then ''export LD_LIBRARY_PATH="${pkgsi686Linux.libGL}/lib:$LD_LIBRARY_PATH"'' else "") + } + export LD_LIBRARY_PATH="${libGL}/lib:$LD_LIBRARY_PATH" + export __GLX_VENDOR_LIBRARY_NAME=mesa + export MESA_LOADER_DRIVER_OVERRIDE=zink + export GALLIUM_DRIVER=zink - "$@" - '' - ) - (writeShellScriptBin "gl_radeonsi" - '' - ${(if with32bit then ''export LD_LIBRARY_PATH="${pkgsi686Linux.libGL}/lib:$LD_LIBRARY_PATH"'' else "")} - export LD_LIBRARY_PATH="${libGL}/lib:$LD_LIBRARY_PATH" - export __GLX_VENDOR_LIBRARY_NAME=mesa - export MESA_LOADER_DRIVER_OVERRIDE=radeonsi - export GALLIUM_DRIVER=radeonsi + "$@" + '') + (writeShellScriptBin "gl_radeonsi" '' + ${ + (if with32bit then ''export LD_LIBRARY_PATH="${pkgsi686Linux.libGL}/lib:$LD_LIBRARY_PATH"'' else "") + } + export LD_LIBRARY_PATH="${libGL}/lib:$LD_LIBRARY_PATH" + export __GLX_VENDOR_LIBRARY_NAME=mesa + export MESA_LOADER_DRIVER_OVERRIDE=radeonsi + export GALLIUM_DRIVER=radeonsi - "$@" - '' - ) + "$@" + '') ]; meta = with pkgs.lib; { diff --git a/pkgs/libs/svt-av1-psyex.nix b/pkgs/libs/svt-av1-psyex.nix index 68bf627..8532f37 100644 --- a/pkgs/libs/svt-av1-psyex.nix +++ b/pkgs/libs/svt-av1-psyex.nix @@ -31,16 +31,14 @@ stdenv.mkDerivation (finalAttrs: { cpuinfo libdovi ] - ++ - (lib.optionals (hdr10plus!=null) [hdr10plus]); + ++ (lib.optionals (hdr10plus != null) [ hdr10plus ]); cmakeFlags = [ "-DSVT_AV1_LTO=ON" "-DUSE_EXTERNAL_CPUINFO=ON" "-DLIBDOVI_FOUND=ON" ] - ++ - (lib.optionals (hdr10plus!=null) ["-DLIBHDR10PLUS_RS_FOUND=ON"]); + ++ (lib.optionals (hdr10plus != null) [ "-DLIBHDR10PLUS_RS_FOUND=ON" ]); meta = with lib; { homepage = "https://github.com/gianni-rosato/svt-av1-psy";