Skip to content

Commit

Permalink
Include more deps for the dev shell
Browse files Browse the repository at this point in the history
When we get rid of the make build system, we would be missing things.
Incuding these packages' deps ensure we don't miss things.
  • Loading branch information
Ericson2314 committed Nov 4, 2024
1 parent 9e1bc9c commit 26ea905
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 8 deletions.
9 changes: 5 additions & 4 deletions packaging/dev-shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,11 @@ in {
++ lib.optional (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) (lib.hiPrio pkgs.buildPackages.clang-tools);

buildInputs = attrs.buildInputs or []
++ [
pkgs.gtest
pkgs.rapidcheck
]
++ pkgs.nixComponents.nix-util.buildInputs
++ pkgs.nixComponents.nix-store.buildInputs
++ pkgs.nixComponents.nix-fetchers.buildInputs
++ pkgs.nixComponents.nix-expr.buildInputs
++ pkgs.nixComponents.nix-store-tests.externalBuildInputs
++ lib.optional havePerl pkgs.perl
;
})
12 changes: 8 additions & 4 deletions src/libstore-tests/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,19 @@ mkMesonExecutable (finalAttrs: {
(fileset.fileFilter (file: file.hasExt "hh") ./.)
];

buildInputs = [
nix-store
nix-store-c
nix-store-test-support
# Hack for sake of the dev shell
passthru.externalBuildInputs = [
sqlite
rapidcheck
gtest
];

buildInputs = finalAttrs.passthru.externalBuildInputs ++ [
nix-store
nix-store-c
nix-store-test-support
];

preConfigure =
# "Inline" .version so it's not a symlink, and includes the suffix.
# Do the meson utils, without modification.
Expand Down

0 comments on commit 26ea905

Please sign in to comment.