mirror of
https://github.com/NixOS/nix.git
synced 2025-11-20 17:29:36 +01:00
Drop external*Inputs from packages
Get rid of some manual package set resolution in favor of splicing again, too. Co-authored-by: John Ericson <John.Ericson@Obsidian.Systems>
This commit is contained in:
parent
1fa235b77c
commit
cb5b0c30aa
7 changed files with 41 additions and 64 deletions
|
|
@ -37,7 +37,15 @@ mkMesonDerivation (finalAttrs: {
|
|||
|
||||
outputs = [ "out" ];
|
||||
|
||||
passthru.externalNativeBuildInputs = [
|
||||
buildInputs = [
|
||||
gtest
|
||||
kaitai-struct-cpp-stl-runtime
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
# This can go away when we bump up to 25.11
|
||||
(kaitai-struct-compiler.overrideAttrs (finalAttrs: {
|
||||
version = "0.11";
|
||||
|
|
@ -48,20 +56,6 @@ mkMesonDerivation (finalAttrs: {
|
|||
}))
|
||||
];
|
||||
|
||||
passthru.externalBuildInputs = [
|
||||
gtest
|
||||
kaitai-struct-cpp-stl-runtime
|
||||
];
|
||||
|
||||
buildInputs = finalAttrs.passthru.externalBuildInputs;
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
]
|
||||
++ finalAttrs.passthru.externalNativeBuildInputs;
|
||||
|
||||
doCheck = true;
|
||||
|
||||
mesonCheckFlags = [ "--print-errorlogs" ];
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue