materus
/
Nixerus
mirror of https://github.com/materusPL/Nixerus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: materus:8b8d4861b56f6e3c49cbd9253b255b92b19c3f68
Branches Tags
materus:master
materus:testing
materus:mock
...
compare: materus:14e31ce7591aae41102c8e417f3f0fb02700c126
Branches Tags
materus:master
materus:testing
materus:mock

2 Commits
8b8d4861b5 ... 14e31ce759

Author SHA1 Message Date
Mateusz Słodkowicz 14e31ce759
amdgpu-pro-libs: update to 6.0.3 2024-04-05 21:15:38 +02:00
Mateusz Słodkowicz 20809b08ee
emacs-materus: init materus configured emacs 2024-04-05 20:37:06 +02:00
3 changed files with 311 additions and 308 deletions
Show Stats Expand all files Collapse all files

23
pkgs/default.nix
View File

@ -1,4 +1,4 @@
{ pkgs, callPackage}: { pkgs, callPackage }:
rec { rec {
amdgpu-pro-libs = pkgs.lib.recurseIntoAttrs { amdgpu-pro-libs = pkgs.lib.recurseIntoAttrs {
vulkan = callPackage ./libs/amdgpu-pro-libs { }; vulkan = callPackage ./libs/amdgpu-pro-libs { };
@ -9,26 +9,29 @@ rec {
}; };
ffmpeg6-amf-full = (if pkgs.lib.versionOlder pkgs.ffmpeg-full.version "6.1" then pkgs.callPackage ./apps/ffmpeg { ffmpeg6-amf-full = (if pkgs.lib.versionOlder pkgs.ffmpeg-full.version "6.1" then
pkgs.callPackage ./apps/ffmpeg
{
inherit (pkgs.darwin.apple_sdk.frameworks) inherit (pkgs.darwin.apple_sdk.frameworks)
Cocoa CoreServices CoreAudio CoreMedia AVFoundation MediaToolbox Cocoa CoreServices CoreAudio CoreMedia AVFoundation MediaToolbox
VideoDecodeAcceleration VideoToolbox; VideoDecodeAcceleration VideoToolbox;
} else } else
(pkgs.ffmpeg-full.overrideAttrs (finalAttrs: previousAttrs: {configureFlags = previousAttrs.configureFlags ++ ["--enable-amf"]; buildInputs = previousAttrs.buildInputs ++ [pkgs.amf-headers]; })) (pkgs.ffmpeg-full.overrideAttrs (finalAttrs: previousAttrs: { configureFlags = previousAttrs.configureFlags ++ [ "--enable-amf" ]; buildInputs = previousAttrs.buildInputs ++ [ pkgs.amf-headers ]; }))
); );
obs-amf = pkgs.qt6Packages.callPackage ./apps/obs { ffmpeg = ffmpeg6-amf-full; inherit libcef;}; obs-amf = pkgs.qt6Packages.callPackage ./apps/obs { ffmpeg = ffmpeg6-amf-full; inherit libcef; };
polymc = pkgs.qt6Packages.callPackage ./apps/games/polymc {}; polymc = pkgs.qt6Packages.callPackage ./apps/games/polymc { };
alvr = pkgs.callPackage ./apps/games/alvr {}; alvr = pkgs.callPackage ./apps/games/alvr { };
vpk_fuse = callPackage ./apps/vpk_fuse.nix {}; vpk_fuse = callPackage ./apps/vpk_fuse.nix { };
fbset = callPackage ./apps/fbset.nix {}; fbset = callPackage ./apps/fbset.nix { };
libcef = callPackage ./libs/libcef.nix {}; libcef = callPackage ./libs/libcef.nix { };
lh2ctrl = callPackage ./apps/lh2ctrl.nix {}; lh2ctrl = callPackage ./apps/lh2ctrl.nix { };
emacs-materus = (pkgs.emacs29.override { withSQLite3 = true; withWebP = true; withX = true; withGTK3 = true; withAlsaLib = true; withGconf = true; withImageMagick = true; withXwidgets = true; });
} }

586
pkgs/libs/amdgpu-pro-libs/amdgpu-src.nix
View File

File diff suppressed because it is too large Load Diff

2
pkgs/libs/amdgpu-pro-libs/update.py
View File

@ -22,7 +22,7 @@ def readPackages(packageString, packages,version):
elif x[0] == "SHA256": elif x[0] == "SHA256":
packages[len(packages) - 1]["sha256"] = x[1].strip() packages[len(packages) - 1]["sha256"] = x[1].strip()
def generateFetchurl(version = "6.0.2", ubuntu_code = "jammy"): def generateFetchurl(version = "6.0.3", ubuntu_code = "jammy"):
packages = [] packages = []
packages32 = [] packages32 = []