File tree Expand file tree Collapse file tree 4 files changed +19
-11
lines changed Expand file tree Collapse file tree 4 files changed +19
-11
lines changed Original file line number Diff line number Diff line change 77 llvmPackages ,
88 meson ,
99 ninja ,
10- nix ,
10+ nixComponents ,
1111 pkg-config ,
1212 nlohmann_json ,
1313 python312 ,
@@ -31,7 +31,10 @@ stdenv.mkDerivation {
3131 nativeCheckInputs = [ lit ] ;
3232
3333 buildInputs = [
34- nix
34+ nixComponents . nix-main
35+ nixComponents . nix-expr
36+ nixComponents . nix-cmd
37+ nixComponents . nix-flake
3538 gtest
3639 boost
3740 llvmPackages . llvm
Original file line number Diff line number Diff line change 3333 callPackage
3434 stdenv
3535 ;
36- nix = nixVersions . nix_2_30 ;
36+ nixComponents = nixVersions . nixComponents_2_30 ;
3737 llvmPackages = llvmPackages_19 ;
3838 nixf = callPackage ./libnixf { } ;
39- nixt = callPackage ./libnixt { inherit nix ; } ;
39+ nixt = callPackage ./libnixt { inherit nixComponents ; } ;
4040 nixd = callPackage ./nixd {
41- inherit nix nixf nixt ;
41+ inherit nixComponents nixf nixt ;
4242 inherit llvmPackages ;
4343 } ;
44- nixdMono = callPackage ./. { inherit nix llvmPackages ; } ;
44+ nixdMono = callPackage ./. { inherit nixComponents llvmPackages ; } ;
4545 nixdLLVM = nixdMono . override { stdenv = if stdenv . isDarwin then stdenv else llvmPackages . stdenv ; } ;
4646 regressionDeps = with pkgs ; [
4747 clang-tools
5252 nativeBuildInputs = old . nativeBuildInputs ++ regressionDeps ;
5353 shellHook = ''
5454 export PATH="${ pkgs . clang-tools } /bin:$PATH"
55- export NIX_SRC=${ nix . src }
55+ export NIX_SRC=${ nixComponents . src }
5656 export NIX_PATH=nixpkgs=${ nixpkgs }
5757 '' ;
5858 hardeningDisable = [ "fortify" ] ;
Original file line number Diff line number Diff line change 44 meson ,
55 ninja ,
66 pkg-config ,
7- nix ,
87 gtest ,
98 boost ,
9+ nixComponents ,
1010} :
1111
1212stdenv . mkDerivation {
@@ -33,7 +33,10 @@ stdenv.mkDerivation {
3333 ] ;
3434
3535 buildInputs = [
36- nix
36+ nixComponents . nix-main
37+ nixComponents . nix-expr
38+ nixComponents . nix-cmd
39+ nixComponents . nix-flake
3740 gtest
3841 boost
3942 ] ;
Original file line number Diff line number Diff line change 44 meson ,
55 ninja ,
66 pkg-config ,
7- nix ,
7+ nixComponents ,
88 nixf ,
99 nixt ,
1010 llvmPackages ,
@@ -39,7 +39,9 @@ stdenv.mkDerivation {
3939 ] ;
4040
4141 buildInputs = [
42- nix
42+ nixComponents . nix-expr
43+ nixComponents . nix-main
44+ nixComponents . nix-cmd
4345 nixf
4446 nixt
4547 llvmPackages . llvm
You can’t perform that action at this time.
0 commit comments