Merge staging-next into staging

2021-02-03 06:18:15 +00:00
parent dec19cba44 77567fd888
commit d867b6f9eb
5 changed files with 13 additions and 12 deletions
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPackages, fetchurl, fetchpatch, flex, cracklib, db4
+{ lib, stdenv, buildPackages, fetchurl, fetchpatch, flex, cracklib, db4, gettext
 , nixosTests
 }:

@@ -25,7 +25,8 @@ stdenv.mkDerivation rec {
  outputs = [ "out" "doc" "man" /* "modules" */ ];

  depsBuildBuild = [ buildPackages.stdenv.cc ];
-  nativeBuildInputs = [ flex ];
+  nativeBuildInputs = [ flex ]
+    ++ lib.optional stdenv.buildPlatform.isDarwin gettext;

  buildInputs = [ cracklib db4 ];