From 3ab72dc590084e6657e944ec20ef982291c8ba7e Mon Sep 17 00:00:00 2001 From: beatzaplenty Date: Wed, 16 Jul 2025 16:06:26 +1000 Subject: [PATCH] Updated flake to include overlay for dvdauthor on nixos modified: flake.nix modified: hosts/nixos/configuration.nix --- flake.nix | 15 ++++++++++++++- hosts/nixos/configuration.nix | 11 ++--------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/flake.nix b/flake.nix index c51f10a..6401908 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,20 @@ }; outputs = { self, nixpkgs, nixos-conf-editor, home-manager, ... } @ inputs: - let system = "x86_64-linux"; in { + let system = "x86_64-linux"; + # Import nixpkgs with our overlay applied + pkgs = import nixpkgs { + inherit system; + overlays = [ + # Your dvdauthor patch overlay + (final: prev: { + dvdauthor = prev.dvdauthor.overrideAttrs (old: { + nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ prev.gettext ]; + }); + }) + ]; + }; + in { nixosConfigurations = { # automatically use each host folder by name nixos = nixpkgs.lib.nixosSystem { diff --git a/hosts/nixos/configuration.nix b/hosts/nixos/configuration.nix index 7abc817..989e6f1 100644 --- a/hosts/nixos/configuration.nix +++ b/hosts/nixos/configuration.nix @@ -12,7 +12,7 @@ in { nodejs appimage-run seahorse -# Remove `brasero` if present + ]; @@ -108,12 +108,5 @@ services.xrdp.openFirewall = true; # WantedBy = [ "default.target" ]; # }; # }; - nixpkgs.overlays = [ - (final: prev: { - brasero = prev.brasero.overrideAttrs (old: { - configureFlags = (old.configureFlags or []) ++ ["--without-dvdauthor"]; - # Or remove dvdauthor from propagatedBuildInputs - }); - }) - ]; + }