Overlay nix instead of overriding the package

This commit is contained in:
Alexander Bantyev 2021-11-12 16:25:09 +03:00
parent 68ac815a23
commit 32793b47cc
Signed by: balsoft
GPG Key ID: E081FF12ADCB4AD5
3 changed files with 8 additions and 7 deletions

View File

@ -559,11 +559,11 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1636267212, "lastModified": 1636623366,
"narHash": "sha256-KDS173KqmqrYUPY9N4vf750GxIo+S6E0djyq2BsQm8s=", "narHash": "sha256-jOQMlv9qFSj0U66HB+ujZoapty0UbewmSNbX8+3ujUQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c935f5e0add2cf0ae650d072c8357533e21b0c35", "rev": "c5ed8beb478a8ca035f033f659b60c89500a3034",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -23,10 +23,6 @@
"serokell-1:aIojg2Vxgv7MkzPJoftOO/I8HKX622sT+c0fjnZBLj0=" "serokell-1:aIojg2Vxgv7MkzPJoftOO/I8HKX622sT+c0fjnZBLj0="
]; ];
package = inputs.nix.defaultPackage.${pkgs.system}.overrideAttrs (oa: {
patches = [ ./nix.patch ] ++ oa.patches or [ ];
});
extraOptions = '' extraOptions = ''
experimental-features = nix-command flakes experimental-features = nix-command flakes
''; '';

View File

@ -158,6 +158,11 @@ in {
]; ];
cmakeFlags = oa.cmakeFlags ++ [ "-DBUILD_SHARED_LIBS=OFF" ]; cmakeFlags = oa.cmakeFlags ++ [ "-DBUILD_SHARED_LIBS=OFF" ];
})).override { mtxclient = self.mtxclient; }; })).override { mtxclient = self.mtxclient; };
nix = inputs.nix.defaultPackage.${pkgs.system}.overrideAttrs (oa: {
patches = [ ./nix/nix.patch ] ++ oa.patches or [ ];
});
}) })
]; ];
nixpkgs.config = { nixpkgs.config = {