diff options
| author | Robert Scott <code@humanleg.org.uk> | 2023-01-02 16:08:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-02 16:08:14 +0000 |
| commit | 84b847da6204e14da29a400d9b1387bf941b2839 (patch) | |
| tree | 6fbdc09a1e633c7ca6230e064c9dc2e683655626 /pkgs/servers | |
| parent | 93b0ea3c352be4af75d632326f4c42af94e33278 (diff) | |
| parent | ad221e06d03086b8730a38e6d926c8e4937233b8 (diff) | |
| download | nixpkgs-84b847da6204e14da29a400d9b1387bf941b2839.tar nixpkgs-84b847da6204e14da29a400d9b1387bf941b2839.tar.gz nixpkgs-84b847da6204e14da29a400d9b1387bf941b2839.tar.bz2 nixpkgs-84b847da6204e14da29a400d9b1387bf941b2839.tar.lz nixpkgs-84b847da6204e14da29a400d9b1387bf941b2839.tar.xz nixpkgs-84b847da6204e14da29a400d9b1387bf941b2839.tar.zst nixpkgs-84b847da6204e14da29a400d9b1387bf941b2839.zip | |
Merge pull request #203815 from LeSuisse/redis-status-check-phase
pkgsStatic.redis: make checkPhase pass
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/nosql/redis/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 804070d0f0f..f99935449cb 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, lua, pkg-config, nixosTests -, tcl, which, ps, fetchpatch +, tcl, which, ps, getconf, fetchpatch , withSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isStatic, systemd # dependency ordering is broken at the moment when building with openssl , tlsSupport ? !stdenv.hostPlatform.isStatic, openssl @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { # darwin currently lacks a pure `pgrep` which is extensively used here doCheck = !stdenv.isDarwin; - checkInputs = [ which tcl ps ]; + checkInputs = [ which tcl ps ] ++ lib.optionals stdenv.hostPlatform.isStatic [ getconf ]; checkPhase = '' runHook preCheck |