apt: patch globally

mgit-at · Aug 24, 2024 · 6540b97 · 6540b97
1 parent 4c605cb
commit 6540b97
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/modules/apt/default.nix b/modules/apt/default.nix
@@ -4,7 +4,6 @@ with lib;
 
 let
   cfg = config.programs.apt;
-  apt_ = pkgs.callPackage ./apt-patched.nix {};
   apt = cfg.package;
 
   apt-mock-packages = pkgs.writeShellScriptBin "apt-mock-packages"
@@ -24,7 +23,7 @@ in
       then options.programs.nix-ld.libraries
       else mkOption { type = types.listOf types.str; default = []; };
 
-    package = lib.mkPackageOption ({ apt = apt_; }) "apt" { };
+    package = lib.mkPackageOption pkgs "apt" { };
   };
 
   config = mkIf (cfg.enable) {

diff --git a/overlay.nix b/overlay.nix
@@ -1,5 +1,6 @@
 final: prev:
   (prev.lib.mapAttrs (pkg: _: prev.callPackage "${./pkgs}/${pkg}" {}) (builtins.readDir ./pkgs)) // {
+    apt_vanilla = prev.apt;
     mkAnsibleDevShell = { extraAnsiblePy ? [], packages ? [], shellHook ? "", ... }@args: final.mkShell (args // {
       LOCALE_ARCHIVE = "${final.glibcLocales}/lib/locale/locale-archive";
 

diff --git a/modules/apt/apt-patched.nix → pkgs/apt/default.nix b/modules/apt/apt-patched.nix → pkgs/apt/default.nix
@@ -1,9 +1,9 @@
 {
-  apt,
+  apt_vanilla,
   dpkg,
 }:
 
-apt.overrideAttrs {
+apt_vanilla.overrideAttrs {
   postInstall = ''
     ln -s ${dpkg}/bin/dpkg $out/bin/dpkg