From eb445e269091e2f3382dcb27e015445c057fd428 Mon Sep 17 00:00:00 2001 From: Rory& Date: Sun, 4 Jan 2026 22:47:33 +0100 Subject: Desktop updates --- flake.lock | 17 +++++++++++++++++ flake.nix | 11 +++++++++++ host/Rory-desktop/configuration.nix | 2 +- 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 295ec60..2c7a726 100644 --- a/flake.lock +++ b/flake.lock @@ -297,6 +297,22 @@ "type": "github" } }, + "ffmpegSrc": { + "flake": false, + "locked": { + "lastModified": 1767538170, + "narHash": "sha256-EwIH4KF57i1yQOiWGwOa50PULBlv1VWksQelyJnR5M0=", + "ref": "refs/heads/master", + "rev": "66f7e9db714a4cb12431c9e20d20207dcceacc55", + "revCount": 122363, + "type": "git", + "url": "https://git.ffmpeg.org/ffmpeg.git" + }, + "original": { + "type": "git", + "url": "https://git.ffmpeg.org/ffmpeg.git" + } + }, "flake-compat": { "flake": false, "locked": { @@ -1556,6 +1572,7 @@ "conduit": "conduit", "drasl": "drasl", "draupnirSrc": "draupnirSrc", + "ffmpegSrc": "ffmpegSrc", "flake-utils": "flake-utils_3", "grapevine": "grapevine", "home-manager": "home-manager", diff --git a/flake.nix b/flake.nix index ad73a86..68a82ce 100755 --- a/flake.nix +++ b/flake.nix @@ -104,6 +104,11 @@ flake = false; }; + ffmpegSrc = { + url = "git+https://git.ffmpeg.org/ffmpeg.git"; + flake = false; + }; + draupnirSrc = { url = "github:the-draupnir-project/Draupnir/main"; flake = false; @@ -470,6 +475,12 @@ ''; }); + packages.ffmpeg-git = self.inputs.nixpkgs-master.legacyPackages.${system}.ffmpeg-full.overrideAttrs (oldAttrs: rec { + src = ffmpegSrc; + version = "git"; + patches = []; + }); + packages.draupnir = (self.inputs.nixpkgs-override-draupnir or self.inputs.nixpkgs-master).legacyPackages.${system}.draupnir; # packages.jetbrains = (self.inputs.jetbrains or self.inputs.nixpkgs).legacyPackages.${system}.jetbrains; diff --git a/host/Rory-desktop/configuration.nix b/host/Rory-desktop/configuration.nix index 6801896..903bc60 100644 --- a/host/Rory-desktop/configuration.nix +++ b/host/Rory-desktop/configuration.nix @@ -29,7 +29,7 @@ args@{ ./optional/gui/hyprland.nix ./services/libvirt.nix - ./services/rabbitmq.nix +# ./services/rabbitmq.nix #./services/edu/mongodb.nix #./optional/gui/x11.nix ./services/printing.nix -- cgit 1.5.1