diff --git a/pkgs/default.nix b/pkgs/default.nix index 68ef157..e297854 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,4 +1,4 @@ -{ pkgs, callPackage}: +{ pkgs, callPackage }: rec { amdgpu-pro-libs = pkgs.lib.recurseIntoAttrs { 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 { - inherit (pkgs.darwin.apple_sdk.frameworks) - Cocoa CoreServices CoreAudio CoreMedia AVFoundation MediaToolbox - VideoDecodeAcceleration VideoToolbox; - } else - (pkgs.ffmpeg-full.overrideAttrs (finalAttrs: previousAttrs: {configureFlags = previousAttrs.configureFlags ++ ["--enable-amf"]; buildInputs = previousAttrs.buildInputs ++ [pkgs.amf-headers]; })) + ffmpeg6-amf-full = (if pkgs.lib.versionOlder pkgs.ffmpeg-full.version "6.1" then + pkgs.callPackage ./apps/ffmpeg + { + inherit (pkgs.darwin.apple_sdk.frameworks) + Cocoa CoreServices CoreAudio CoreMedia AVFoundation MediaToolbox + VideoDecodeAcceleration VideoToolbox; + } else + (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; }); }