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

obs-amf: remove, libcef: remove, ffmpeg: use from nixpkgs

Browse Source
This commit is contained in:
Mateusz Słodkowicz
2024-06-25 11:59:28 +02:00
parent 0c50a9aeff
commit e206138a39
12 changed files with 1 additions and 5958 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/default.nix
+1 -15
View File
@@ -9,17 +9,7 @@ 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 ]; }))
);
obs-amf = pkgs.qt6Packages.callPackage ./apps/obs { ffmpeg = ffmpeg6-amf-full; inherit libcef; };
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 { };
polymc-qt5 = pkgs.libsForQt5.callPackage ./apps/games/polymc { };
@@ -30,9 +20,5 @@ rec {
fbset = callPackage ./apps/fbset.nix { };
libcef = callPackage ./libs/libcef.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; });
}