Merge pull request #11803 from obsidiansystems/factor-out-dev-shell

Dev shell improvements
2024-11-05 23:58:52 -05:00
parent dfd0033afb c49a0ae8b8
commit bf19e5c34b
3 changed files with 121 additions and 106 deletions
--- a/src/libstore-tests/package.nix
+++ b/src/libstore-tests/package.nix
@@ -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.