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

Merge pull request #14488 from Mic92/kaitai-struct

Browse source 
nix-kaitai-struct: make it not longer part of the devshell
This commit is contained in:
John Ericson 2025-11-05 21:57:29 +00:00 • committed by GitHub
commit 6bd92d47e5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
meson.build
View file

@ -61,4 +61,3 @@ if get_option('unit-tests')
endif endif
subproject('nix-functional-tests') subproject('nix-functional-tests')
subproject('json-schema-checks') subproject('json-schema-checks')
subproject('kaitai-struct-checks')

4
packaging/dev-shell.nix
View file

@ -109,7 +109,6 @@ pkgs.nixComponents2.nix-util.overrideAttrs (
++ pkgs.nixComponents2.nix-external-api-docs.nativeBuildInputs ++ pkgs.nixComponents2.nix-external-api-docs.nativeBuildInputs
++ pkgs.nixComponents2.nix-functional-tests.externalNativeBuildInputs ++ pkgs.nixComponents2.nix-functional-tests.externalNativeBuildInputs
++ pkgs.nixComponents2.nix-json-schema-checks.externalNativeBuildInputs ++ pkgs.nixComponents2.nix-json-schema-checks.externalNativeBuildInputs
++ pkgs.nixComponents2.nix-kaitai-struct-checks.externalNativeBuildInputs
++ lib.optional ( ++ lib.optional (
!buildCanExecuteHost !buildCanExecuteHost
# Hack around https://github.com/nixos/nixpkgs/commit/bf7ad8cfbfa102a90463433e2c5027573b462479 # Hack around https://github.com/nixos/nixpkgs/commit/bf7ad8cfbfa102a90463433e2c5027573b462479
@ -149,7 +148,6 @@ pkgs.nixComponents2.nix-util.overrideAttrs (
++ pkgs.nixComponents2.nix-expr.externalPropagatedBuildInputs ++ pkgs.nixComponents2.nix-expr.externalPropagatedBuildInputs
++ pkgs.nixComponents2.nix-cmd.buildInputs ++ pkgs.nixComponents2.nix-cmd.buildInputs
++ lib.optionals havePerl pkgs.nixComponents2.nix-perl-bindings.externalBuildInputs ++ lib.optionals havePerl pkgs.nixComponents2.nix-perl-bindings.externalBuildInputs
++ lib.optional havePerl pkgs.perl ++ lib.optional havePerl pkgs.perl;
++ pkgs.nixComponents2.nix-kaitai-struct-checks.externalBuildInputs;
} }
) )

1
src/kaitai-struct-checks/package.nix
View file

@ -1,4 +1,5 @@
# Run with: nix build .#nix-kaitai-struct-checks # Run with: nix build .#nix-kaitai-struct-checks
# or: `nix develop .#nix-kaitai-struct-checks` to enter a dev shell
{ {
lib, lib,
mkMesonDerivation, mkMesonDerivation,