materus/Nixerus
1
0
Fork 0
mirror of https://github.com/materusPL/Nixerus.git synced 2026-07-09 16:41:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add intelij idea community. Formatting in packages and fixes after update to 26.05

Browse Source
This commit is contained in:
Mateusz Słodkowicz
2026-06-11 22:25:21 +02:00
parent ba3310fb53
commit cdfb9779d5
14 changed files with 309 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/libs/amdgpu-pro-libs/amf.nix
+9 -4
View File
@@ -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 = [
pkgs/libs/amdgpu-pro-libs/default.nix
+26 -8
View File
@@ -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"
];
};
}
pkgs/libs/amdgpu-pro-libs/firmware.nix
+7 -4
View File
@@ -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;
pkgs/libs/amdgpu-pro-libs/opengl.nix
+31 -10
View File
@@ -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"
];
};
}
pkgs/libs/amdgpu-pro-libs/prefixes.nix
+86 -66
View File
@@ -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; {
pkgs/libs/svt-av1-psyex.nix
+2 -4
View File
@@ -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";