materus/Nixerus
1
0
Fork 0
mirror of https://github.com/materusPL/Nixerus.git synced 2026-06-19 00:47:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: materus:57c8b3dc63c0d13b1122e3d12370722c41116497
Branches Tags
materus:master
materus:dependabot/github_actions/cachix/cachix-action-17
materus:testing
materus:mock
..
compare: materus:ba3310fb537a6990c5d35f5df524e59921586dfd
Branches Tags
materus:master
materus:dependabot/github_actions/cachix/cachix-action-17
materus:testing
materus:mock

No commits in common. "57c8b3dc63c0d13b1122e3d12370722c41116497" and "ba3310fb537a6990c5d35f5df524e59921586dfd" have entirely different histories.
57c8b3dc63 ... ba3310fb53

14 changed files with 166 additions and 308 deletions
Show Stats Expand all files Collapse all files

12
flake.lock generated
View File

@ -28,11 +28,11 @@
]
},
"locked": {
"lastModified": 1781189114,
"narHash": "sha256-5inaamLgUMWy+MOBE9ChF9QAF1o/74LFuHkI0W/9rqc=",
"lastModified": 1781009359,
"narHash": "sha256-w/mZkRscTatf8NWyUstli8ROzM/eopxZzi0WRjoeYkU=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "486595d2cf49cfcd649b58a284fa11ac0e34da22",
"rev": "c58ead12efcac436afffa93a22099a5595eb4157",
"type": "github"
},
"original": {
@ -80,11 +80,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1781208515,
"narHash": "sha256-Ke76KeYDAnm/w3OGEviATXQMFw4QnRPFS/Wj6MWqM0Y=",
"lastModified": 1781015510,
"narHash": "sha256-DqRzaFfLijAyd3TDilgKEjNiqJ1UVymA/seyVamoWS4=",
"owner": "nix-community",
"repo": "NUR",
"rev": "d66d4c98290f2b8dc3487e43bd1eb3d038039ab2",
"rev": "961e2e196da88c8d6513bb8e9865ec5e5a6cb954",
"type": "github"
},
"original": {

15
pkgs/apps/fbset.nix
View File

@ -1,11 +1,5 @@
{
lib,
stdenv,
fetchurl,
dpkg,
autoPatchelfHook,
perl,
}:
{ pkgs, lib, stdenv, fetchurl, dpkg, autoPatchelfHook, perl }:
stdenv.mkDerivation rec {
pname = "fbset";
@ -19,10 +13,7 @@ stdenv.mkDerivation rec {
dontBuild = true;
buildInputs = [ perl ];
nativeBuildInputs = [
dpkg
autoPatchelfHook
];
nativeBuildInputs = [dpkg autoPatchelfHook];
unpackPhase = ''
dpkg -x $src .

34
pkgs/apps/games/alvr/default.nix
View File

@ -1,24 +1,4 @@
{
stdenv,
fetchzip,
glib,
lib,
alsa-lib,
gtk3,
libunwind,
x264,
vulkan-loader,
libX11,
libXau,
libva,
libdrm,
libXdmcp,
libXfixes,
libXext,
libbsd,
libmd,
xz,
}:
{ stdenv, fetchzip, fetchurl, glib, lib, alsa-lib, gtk3, libunwind, x264, vulkan-loader, xorg, libva, libdrm, libvdpau, libbsd, libmd, xz }:
stdenv.mkDerivation rec {
pname = "alvr";
version = "v20.5.0";
@ -38,11 +18,11 @@ stdenv.mkDerivation rec {
glib
x264.lib
vulkan-loader
libX11
libXau
libXdmcp
libXext
libXfixes
xorg.libX11
xorg.libXau
xorg.libXdmcp
xorg.libXext
xorg.libXfixes
libva
libdrm
libunwind
@ -84,7 +64,7 @@ stdenv.mkDerivation rec {
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 = [ ];
maintainers = with maintainers; [];
license = licenses.mit;
platforms = [ "x86_64-linux" ];
};

16
pkgs/apps/games/polymc/default.nix
View File

@ -10,6 +10,7 @@
zlib,
file,
kdePackages,
xorg,
libpulseaudio,
openal,
qtbase,
@ -20,12 +21,6 @@
udev,
mesa-demos,
quazip,
libX11,
libXext,
libXcursor,
libXrandr,
libXxf86vm,
xrandr,
libGL,
flite,
tomlplusplus,
@ -43,11 +38,13 @@ let
polymc =
let
binpath = lib.makeBinPath [
xrandr
xorg.xrandr
mesa-demos
pciutils
];
libpath = lib.makeLibraryPath [
libpath =
with xorg;
lib.makeLibraryPath [
glfw3-minecraft
libX11
libXext
@ -119,8 +116,7 @@ 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 \

23
pkgs/apps/idea-community.nix
View File

@ -1,23 +0,0 @@
{
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";
version = "2026.1.3";
buildNumber = "261.25134.95";
meta = (oldAttrs.meta or {}) // {
license = lib.licenses.asl20;
};
}))

17
pkgs/apps/lh2ctrl.nix
View File

@ -1,19 +1,13 @@
{
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; [
(python3.withPackages (pythonPackages: with pythonPackages; [
bluepy
]
))
]))
];
src = fetchFromGitHub {
@ -32,3 +26,4 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
};
}

17
pkgs/apps/vpk_fuse.nix
View File

@ -1,12 +1,7 @@
{
lib,
stdenv,
fetchFromGitHub,
fuse,
pkg-config,
}:
{ pkgs, lib, stdenv, fetchFromGitHub, fuse, pkg-config }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "vpk_fuse";
version = "15042023";
src = fetchFromGitHub {
@ -16,10 +11,8 @@ stdenv.mkDerivation {
sha256 = "sha256-HoENTIHM4Nmocoh2bxxuk1ZLsq4bSUGzeKgEufsPUJA=";
};
buildInputs = [
fuse
pkg-config
];
buildInputs = [ fuse pkg-config];
installPhase = ''
mkdir -p $out/bin

13
pkgs/default.nix
View File

@ -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,14 +9,7 @@
};
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 { };
@ -27,6 +20,4 @@
fbset = callPackage ./apps/fbset.nix { };
lh2ctrl = callPackage ./apps/lh2ctrl.nix { };
idea-oss-bin = callPackage ./apps/idea-community.nix { };
}

13
pkgs/libs/amdgpu-pro-libs/amf.nix
View File

@ -1,12 +1,4 @@
{
lib,
stdenv,
libdrm,
dpkg,
vulkan-loader,
patchelf,
fetchurl,
}:
{ pkgs, lib, stdenv, libdrm, dpkg, vulkan-loader, patchelf, fetchurl }:
let
sources = import ./amdgpu-src.nix { inherit fetchurl; };
@ -15,11 +7,14 @@ 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 = [

34
pkgs/libs/amdgpu-pro-libs/default.nix
View File

@ -1,17 +1,4 @@
{
pkgs,
lib,
stdenv,
openssl,
libdrm,
zlib,
dpkg,
patchelf,
fetchurl,
libX11,
libxcb,
libxshmfence,
}:
{ pkgs, lib, xorg, stdenv, openssl, libdrm, zlib, dpkg, patchelf, fetchurl }:
let
sources = import ./amdgpu-src.nix { inherit fetchurl; };
@ -22,11 +9,9 @@ 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 = ".";
@ -38,9 +23,9 @@ stdenv.mkDerivation rec {
libdrm
openssl
stdenv.cc.cc.lib
libX11
libxcb
libxshmfence
xorg.libX11
xorg.libxcb
xorg.libxshmfence
zlib
];
rpath = lib.makeLibraryPath buildInputs;
@ -62,9 +47,6 @@ 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" ];
};
}

11
pkgs/libs/amdgpu-pro-libs/firmware.nix
View File

@ -1,9 +1,4 @@
{
lib,
stdenv,
dpkg,
fetchurl,
}:
{ pkgs, lib, stdenv, libdrm, dpkg, vulkan-loader, patchelf, fetchurl }:
let
sources = import ./amdgpu-src.nix { inherit fetchurl; };
@ -15,7 +10,7 @@ stdenv.mkDerivation rec {
src = sources.bit64.amdgpu-dkms-firmware;
passthru = {
vcn = stdenv.mkDerivation {
vcn = stdenv.mkDerivation rec {
pname = "amdgpu-firmware-vcn";
inherit src;
inherit version;
@ -27,6 +22,7 @@ stdenv.mkDerivation rec {
inherit nativeBuildInputs;
inherit sourceRoot;
installPhase = ''
mkdir -p $out/lib/firmware/amdgpu
mv lib/firmware/updates/amdgpu/vcn* $out/lib/firmware/amdgpu
@ -35,6 +31,7 @@ stdenv.mkDerivation rec {
};
};
dontFixup = true;
dontBuild = true;
dontPatchELF = true;

41
pkgs/libs/amdgpu-pro-libs/opengl.nix
View File

@ -1,24 +1,4 @@
{
pkgs,
lib,
systemd,
mesa,
stdenv,
expat,
openssl,
libX11,
libxcb,
libXext,
libXfixes,
libXxf86vm,
libxshmfence,
libdrm,
zlib,
wayland,
dpkg,
patchelf,
fetchurl,
}:
{ pkgs, lib, systemd, xorg, mesa, stdenv, expat, openssl, libdrm, zlib, wayland, dpkg, patchelf, fetchurl }:
let
sources = import ./amdgpu-src.nix { inherit fetchurl; };
@ -29,6 +9,7 @@ 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
@ -37,6 +18,7 @@ stdenv.mkDerivation rec {
sources.bit64.libgles2-amdgpu-pro-oglp
];
src32 = [
sources.bit32.libgl1-amdgpu-pro-oglp-dri
sources.bit32.libgl1-amdgpu-pro-oglp-glx
@ -58,12 +40,12 @@ stdenv.mkDerivation rec {
openssl
expat
stdenv.cc.cc.lib
libX11
libxcb
libXext
libXfixes
libXxf86vm
libxshmfence
xorg.libX11
xorg.libxcb
xorg.libXext
xorg.libXfixes
xorg.libXxf86vm
xorg.libxshmfence
zlib
wayland
systemd
@ -87,9 +69,6 @@ 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" ];
};
}

100
pkgs/libs/amdgpu-pro-libs/prefixes.nix
View File

@ -1,12 +1,12 @@
{
pkgs,
pkgsi686Linux,
driversi686Linux,
amdgpu-pro-libs,
amdvlk,
mesa,
libGL,
with32bit ? true,
{ pkgs
, pkgsi686Linux
, driversi686Linux
, stdenv
, amdgpu-pro-libs
, amdvlk
, mesa
, libGL
, with32bit ? true
}:
let
amf-amd-pro = amdgpu-pro-libs.amf;
@ -20,87 +20,67 @@ pkgs.buildEnv {
name = "amdgpu-pro-prefixes";
paths = with pkgs; [
(writeShellScriptBin "vk_pro" ''
(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
""
)
}
${(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" ''
''
)
(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
""
)
}
${(if with32bit then ''export VK_ICD_FILENAMES=$VK_ICD_FILENAMES:${driversi686Linux.amdvlk}/share/vulkan/icd.d/amd_icd32.json'' else "")}
"$@"
'')
''
)
(writeShellScriptBin "vk_radv" ''
(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
""
)
}
${(if with32bit then ''export VK_ICD_FILENAMES=$VK_ICD_FILENAMES:${driversi686Linux.mesa}/share/vulkan/icd.d/radeon_icd.i686.json'' else "")}
"$@"
'')
''
)
(writeShellScriptBin "gl_pro" ''
(writeShellScriptBin "gl_pro"
''
export __GLX_VENDOR_LIBRARY_NAME=amd
export LIBGL_DRIVERS_PATH="${oglp-amd-pro}/lib/dri"
${
(
if with32bit then
''
${(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
""
)
}
'' 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 "")
}
''
)
(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 "")
}
''
)
(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; {

6
pkgs/libs/svt-av1-psyex.nix
View File

@ -31,14 +31,16 @@ 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";