Skip to content

Commit c96c923

Browse files
committed
switch to nixComponents
1 parent 5e224c1 commit c96c923

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

default.nix

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
makeWrapper,
99
meson,
1010
ninja,
11-
nix,
1211
nlohmann_json,
1312
pkg-config,
13+
nixComponents,
1414
}:
1515

1616
let
@@ -30,7 +30,11 @@ stdenv.mkDerivation {
3030
inherit src;
3131
buildInputs = [
3232
nlohmann_json
33-
nix
33+
nixComponents.nix-main
34+
nixComponents.nix-store
35+
nixComponents.nix-expr
36+
nixComponents.nix-cmd
37+
nixComponents.nix-flake
3438
boost
3539
];
3640
nativeBuildInputs = [

flake.nix

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,11 @@
4040
}:
4141
let
4242
inherit (pkgs) stdenv;
43-
drvArgs = {
44-
nix = pkgs.nixVersions.nix_2_30;
45-
};
4643
in
4744
{
48-
packages.nix-unit = pkgs.callPackage ./default.nix drvArgs;
45+
packages.nix-unit = pkgs.callPackage ./default.nix {
46+
nixComponents = pkgs.nixVersions.nixComponents_2_30;
47+
};
4948
packages.default = self'.packages.nix-unit;
5049
packages.doc = pkgs.callPackage ./doc {
5150
inherit self;

0 commit comments

Comments
 (0)