diff --git a/meson.build b/meson.build index c493dfad6..f3158ea6d 100644 --- a/meson.build +++ b/meson.build @@ -61,4 +61,3 @@ if get_option('unit-tests') endif subproject('nix-functional-tests') subproject('json-schema-checks') -subproject('kaitai-struct-checks') diff --git a/packaging/dev-shell.nix b/packaging/dev-shell.nix index ea12e079f..153e7a3eb 100644 --- a/packaging/dev-shell.nix +++ b/packaging/dev-shell.nix @@ -109,7 +109,6 @@ pkgs.nixComponents2.nix-util.overrideAttrs ( ++ pkgs.nixComponents2.nix-external-api-docs.nativeBuildInputs ++ pkgs.nixComponents2.nix-functional-tests.externalNativeBuildInputs ++ pkgs.nixComponents2.nix-json-schema-checks.externalNativeBuildInputs - ++ pkgs.nixComponents2.nix-kaitai-struct-checks.externalNativeBuildInputs ++ lib.optional ( !buildCanExecuteHost # 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-cmd.buildInputs ++ lib.optionals havePerl pkgs.nixComponents2.nix-perl-bindings.externalBuildInputs - ++ lib.optional havePerl pkgs.perl - ++ pkgs.nixComponents2.nix-kaitai-struct-checks.externalBuildInputs; + ++ lib.optional havePerl pkgs.perl; } ) diff --git a/src/kaitai-struct-checks/package.nix b/src/kaitai-struct-checks/package.nix index 263dd6fd1..97d56aabd 100644 --- a/src/kaitai-struct-checks/package.nix +++ b/src/kaitai-struct-checks/package.nix @@ -1,4 +1,5 @@ # Run with: nix build .#nix-kaitai-struct-checks +# or: `nix develop .#nix-kaitai-struct-checks` to enter a dev shell { lib, mkMesonDerivation,