max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2025-01-19 01:26:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Include more deps for the dev shell

Browse source 
When we get rid of the make build system, we would be missing things.
Incuding these packages' deps ensure we don't miss things.
This commit is contained in:
John Ericson 2024-11-04 14:33:09 -05:00
parent 9e1bc9c224
commit 26ea905312
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
packaging/dev-shell.nix
View file

@ -86,10 +86,11 @@ in {
++ lib.optional (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) (lib.hiPrio pkgs.buildPackages.clang-tools); ++ lib.optional (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) (lib.hiPrio pkgs.buildPackages.clang-tools);
buildInputs = attrs.buildInputs or [] buildInputs = attrs.buildInputs or []
++ [ ++ pkgs.nixComponents.nix-util.buildInputs
pkgs.gtest ++ pkgs.nixComponents.nix-store.buildInputs
pkgs.rapidcheck ++ pkgs.nixComponents.nix-fetchers.buildInputs
] ++ pkgs.nixComponents.nix-expr.buildInputs
++ pkgs.nixComponents.nix-store-tests.externalBuildInputs
++ lib.optional havePerl pkgs.perl ++ lib.optional havePerl pkgs.perl
; ;
}) })

12
src/libstore-tests/package.nix
View file

@ -38,15 +38,19 @@ mkMesonExecutable (finalAttrs: {
(fileset.fileFilter (file: file.hasExt "hh") ./.) (fileset.fileFilter (file: file.hasExt "hh") ./.)
]; ];
buildInputs = [ # Hack for sake of the dev shell
nix-store passthru.externalBuildInputs = [
nix-store-c
nix-store-test-support
sqlite sqlite
rapidcheck rapidcheck
gtest gtest
]; ];
buildInputs = finalAttrs.passthru.externalBuildInputs ++ [
nix-store
nix-store-c
nix-store-test-support
];
preConfigure = preConfigure =
# "Inline" .version so it's not a symlink, and includes the suffix. # "Inline" .version so it's not a symlink, and includes the suffix.
# Do the meson utils, without modification. # Do the meson utils, without modification.