Skip to content

Commit

Permalink
nixUnstable: add util-linuxMinimal to buildInputs
Browse files Browse the repository at this point in the history
Fixes an issue in tests where they can fail with `../common.sh: line 92:
unshare: command not found`.
  • Loading branch information
cole-h committed Mar 22, 2021
1 parent fdb83b8 commit e9eab75
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion pkgs/tools/package-management/nix/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ let

common =
{ lib, stdenv, perl, curl, bzip2, sqlite, openssl ? null, xz
, bash, coreutils, gzip, gnutar
, bash, coreutils, util-linuxMinimal, gzip, gnutar
, pkg-config, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json
, autoreconfHook, autoconf-archive, bison, flex
, jq, libarchive, libcpuid
Expand Down Expand Up @@ -57,6 +57,7 @@ common =
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
++ lib.optionals is24 [ libarchive gmock lowdown ]
++ lib.optional (is24 && stdenv.isx86_64) libcpuid
++ lib.optionals (is24 && stdenv.isLinux) [ util-linuxMinimal ]
++ lib.optional withLibseccomp libseccomp
++ lib.optional withAWS
((aws-sdk-cpp.override {
Expand Down

0 comments on commit e9eab75

Please sign in to comment.