From 6e76c7422a05af981aa03e0b9ae4bab929838bd5 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Tue, 9 Jul 2024 11:22:27 +0200 Subject: [PATCH] nixos/core: use inline nix-index override It was used only in this place --- nix-os/core.nix | 8 ++++++++ pkgs/by-name/ni/nix-index/override.nix | 9 --------- 2 files changed, 8 insertions(+), 9 deletions(-) delete mode 100644 pkgs/by-name/ni/nix-index/override.nix diff --git a/nix-os/core.nix b/nix-os/core.nix index bb6ca15..30d4c7e 100644 --- a/nix-os/core.nix +++ b/nix-os/core.nix @@ -82,6 +82,14 @@ in # Use nix-index for command-not-found handler programs.command-not-found.enable = false; programs.nix-index = { + package = pkgs.nix-index.override { + nix-index-unwrapped = pkgs.nix-index-unwrapped.overrideAttrs (oldAttrs: { + patches = oldAttrs.patches or [] ++ [ + ../pkgs/by-name/ni/nix-index/cnfOutput.patch + ]; + }); + + }; enable = true; enableBashIntegration = true; }; diff --git a/pkgs/by-name/ni/nix-index/override.nix b/pkgs/by-name/ni/nix-index/override.nix deleted file mode 100644 index e0513e4..0000000 --- a/pkgs/by-name/ni/nix-index/override.nix +++ /dev/null @@ -1,9 +0,0 @@ -{self, super, package }: - -package.override { - nix-index-unwrapped = self.nix-index-unwrapped.overrideAttrs (oldAttrs: { - patches = oldAttrs.patches or [] ++ [ - ./cnfOutput.patch - ]; - }); -}