From 32793b47ccaa56c0c44c1f17a51435d3269df764 Mon Sep 17 00:00:00 2001
From: Alexander Bantyev <balsoft@balsoft.ru>
Date: Fri, 12 Nov 2021 16:25:09 +0300
Subject: [PATCH] Overlay nix instead of overriding the package

---
 flake.lock               | 6 +++---
 profiles/nix/default.nix | 4 ----
 profiles/overlay.nix     | 5 +++++
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/flake.lock b/flake.lock
index 48d63e5..577aa17 100644
--- a/flake.lock
+++ b/flake.lock
@@ -559,11 +559,11 @@
     },
     "nixpkgs_8": {
       "locked": {
-        "lastModified": 1636267212,
-        "narHash": "sha256-KDS173KqmqrYUPY9N4vf750GxIo+S6E0djyq2BsQm8s=",
+        "lastModified": 1636623366,
+        "narHash": "sha256-jOQMlv9qFSj0U66HB+ujZoapty0UbewmSNbX8+3ujUQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c935f5e0add2cf0ae650d072c8357533e21b0c35",
+        "rev": "c5ed8beb478a8ca035f033f659b60c89500a3034",
         "type": "github"
       },
       "original": {
diff --git a/profiles/nix/default.nix b/profiles/nix/default.nix
index 76094d0..a27376c 100644
--- a/profiles/nix/default.nix
+++ b/profiles/nix/default.nix
@@ -23,10 +23,6 @@
       "serokell-1:aIojg2Vxgv7MkzPJoftOO/I8HKX622sT+c0fjnZBLj0="
     ];
 
-    package = inputs.nix.defaultPackage.${pkgs.system}.overrideAttrs (oa: {
-      patches = [ ./nix.patch ] ++ oa.patches or [ ];
-    });
-
     extraOptions = ''
       experimental-features = nix-command flakes
     '';
diff --git a/profiles/overlay.nix b/profiles/overlay.nix
index bb21393..b4ae0dc 100644
--- a/profiles/overlay.nix
+++ b/profiles/overlay.nix
@@ -158,6 +158,11 @@ in {
         ];
         cmakeFlags = oa.cmakeFlags ++ [ "-DBUILD_SHARED_LIBS=OFF" ];
       })).override { mtxclient = self.mtxclient; };
+
+      nix = inputs.nix.defaultPackage.${pkgs.system}.overrideAttrs (oa: {
+        patches = [ ./nix/nix.patch ] ++ oa.patches or [ ];
+      });
+
     })
   ];
   nixpkgs.config = {