ckie/nixos-module
0
0
Fork 0
forked from lix-project/nixos-module
Code Pull requests Activity

Merge pull request 'overlay: support nix-doc integration into Lix' (#11) from feature/nix-doc into main

Browse source 
Reviewed-on: lix-project/nixos-module#11
This commit is contained in:
jade 2024-04-03 22:48:05 +00:00
parent 4c47db0949 d1d43e601c
commit 8937cebb4f
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
flake.lock
View file

@ -51,11 +51,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1711639271, "lastModified": 1712180067,
"narHash": "sha256-SIdsZPOTKIkcTCm5e5bdIffC9UJygwQBEa4C55XUxJM=", "narHash": "sha256-XU32CuKt0wXB8Ws5P3pZFMlYIMVx9om1GycYpITAwZ0=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "47b0967cd1a28b780558e9db403c8e28bae11a13", "rev": "89c31953c58d8089c85ae7ab43a5c59bb0f9f69b",
"revCount": 15250, "revCount": 15311,
"type": "git", "type": "git",
"url": "ssh://git@git.lix.systems/lix-project/lix.git" "url": "ssh://git@git.lix.systems/lix-project/lix.git"
}, },

4
overlay.nix
View file

@ -14,6 +14,9 @@ let
]; ];
}) })
); );
# Internal nix-doc used by Lix.
lix-doc = final.callPackage (lix + "/nix-doc/package.nix") { };
in in
{ {
nixVersions = prev.nixVersions // rec { nixVersions = prev.nixVersions // rec {
@ -30,6 +33,7 @@ in
patches = [ ]; patches = [ ];
buildInputs = old.buildInputs or [ ] ++ [ buildInputs = old.buildInputs or [ ] ++ [
final.toml11 final.toml11
lix-doc
]; ];
nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [
final.buildPackages.cmake final.buildPackages.cmake