Skip to content

Commit

Permalink
Improve dev shell
Browse files Browse the repository at this point in the history
Ericson2314 committed Nov 4, 2024
1 parent 5bcc884 commit 97bc114
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
@@ -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
@@ -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.

0 comments on commit 97bc114

Please sign in to comment.