1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-08 19:46:02 +01:00

Fix Windows dev shell (mostly)

gbenchmark still has too-narrow supported systems, however. That needs
to be fixed in Nixpkgs.
This commit is contained in:
John Ericson 2025-10-12 13:16:50 -04:00
parent d9cabddd17
commit 9150ccb89e

View file

@ -2,16 +2,7 @@
lib, lib,
stdenv, stdenv,
mkMesonDerivation, mkMesonDerivation,
buildPackages,
meson,
ninja,
pkg-config,
jq,
git,
mercurial,
util-linux,
unixtools,
nix-store, nix-store,
nix-expr, nix-expr,
@ -46,16 +37,17 @@ mkMesonDerivation (
./. ./.
]; ];
# Hack for sake of the dev shell # Hack for sake of the dev shell. Need to "manually splice" since
# this isn't a specially-recognized list of dependencies.
passthru.externalNativeBuildInputs = [ passthru.externalNativeBuildInputs = [
meson buildPackages.meson
ninja buildPackages.ninja
pkg-config buildPackages.pkg-config
jq buildPackages.jq
git buildPackages.git
mercurial buildPackages.mercurial
unixtools.script buildPackages.unixtools.script
] ]
++ lib.optionals stdenv.hostPlatform.isLinux [ ++ lib.optionals stdenv.hostPlatform.isLinux [
# For various sandboxing tests that needs a statically-linked shell, # For various sandboxing tests that needs a statically-linked shell,
@ -64,7 +56,7 @@ mkMesonDerivation (
# For Overlay FS tests need `mount`, `umount`, and `unshare`. # For Overlay FS tests need `mount`, `umount`, and `unshare`.
# For `script` command (ensuring a TTY) # For `script` command (ensuring a TTY)
# TODO use `unixtools` to be precise over which executables instead? # TODO use `unixtools` to be precise over which executables instead?
util-linux buildPackages.util-linux
]; ];
nativeBuildInputs = finalAttrs.passthru.externalNativeBuildInputs ++ [ nativeBuildInputs = finalAttrs.passthru.externalNativeBuildInputs ++ [