Skip to content

Commit

Permalink
tests: Update Nix dependencies
Browse files Browse the repository at this point in the history
git belongs to dependencies executable on build platform.
This is now enforced with strictDeps:
NixOS/nixpkgs@5876256

libpcap has already been added downstream:
NixOS/nixpkgs@a25fb7a

udevadm needs to be added to native inputs since it is expected by tests:
NixOS/nixpkgs@ded8c86
  • Loading branch information
jtojnar committed Mar 2, 2024
1 parent f8fb070 commit 1ab850f
Showing 1 changed file with 12 additions and 4 deletions.
16 changes: 12 additions & 4 deletions tests/run-nix
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,18 @@ in pkgs.umockdev.overrideAttrs (attrs: {
patches = [];
preCheck = "";
doCheck = true;
nativeBuildInputs = attrs.nativeBuildInputs ++ [ ${DEBUG:+pkgs.breakpointHook} ];
# git is a "meson dist" time dependency
# libpcap is a new dependency, it can be removed again later
buildInputs = attrs.buildInputs ++ [ pkgs.git pkgs.libpcap ];
nativeBuildInputs = attrs.nativeBuildInputs ++ [
${DEBUG:+pkgs.breakpointHook}
# git is a "meson dist" time dependency
pkgs.git
];
buildInputs = attrs.buildInputs ++ [
# Add new runtime (executable on host) dependencies here.
];
nativeCheckInputs = attrs.nativeCheckInputs or [ ] ++ [
# Add udevadm for tests, since unlike Nixpkgs, we do not patch umockdev-record.
pkgs.systemdMinimal
];
})
EOG
Expand Down

0 comments on commit 1ab850f

Please sign in to comment.