From 09a1cc5a2658120f151ffe60b5c5bb66e87b424a Mon Sep 17 00:00:00 2001 From: Nettika Date: Mon, 23 Sep 2024 16:46:50 -0700 Subject: [PATCH] Move ffcheck into a separate package --- hosts/marauder/default.nix | 7 +------ hosts/marauder/dev.nix | 0 hosts/marauder/ffcheck.nix | 3 +++ 3 files changed, 4 insertions(+), 6 deletions(-) mode change 100644 => 100755 hosts/marauder/dev.nix create mode 100755 hosts/marauder/ffcheck.nix diff --git a/hosts/marauder/default.nix b/hosts/marauder/default.nix index 63f1936..8171bc0 100755 --- a/hosts/marauder/default.nix +++ b/hosts/marauder/default.nix @@ -1,9 +1,4 @@ { self, pkgs, inputs, ... }: -let - ffcheck = pkgs.writeShellScriptBin "ffcheck" '' - ${pkgs.ffmpeg}/bin/ffmpeg -v error -stats -hide_banner -i "$1" -c copy -f null - - ''; -in { imports = [ self.nixosModules.common @@ -65,7 +60,6 @@ in environment = { systemPackages = [ - ffcheck inputs.shelvacu.packages.x86_64-linux.sm64coopdx ] ++ (with pkgs; [ # Chat clients @@ -88,6 +82,7 @@ in # Multimedia vlc ffmpeg + (callPackage ./ffcheck.nix { }) # Productivity obsidian diff --git a/hosts/marauder/dev.nix b/hosts/marauder/dev.nix old mode 100644 new mode 100755 diff --git a/hosts/marauder/ffcheck.nix b/hosts/marauder/ffcheck.nix new file mode 100755 index 0000000..b89089a --- /dev/null +++ b/hosts/marauder/ffcheck.nix @@ -0,0 +1,3 @@ +{ writeShellScriptBin, ffmpeg }: writeShellScriptBin "ffcheck" '' + ${ffmpeg}/bin/ffmpeg -v error -stats -hide_banner -i "$1" -c copy -f null - +''