Merge pull request #84415 from matthewbauer/mb-cross-fixes-april2020

Cross compilation fixes [april 2020]
2020-04-13 16:48:38 -04:00
parent 940c35568b c6ff360cc4
commit e520d6af29
36 changed files with 187 additions and 83 deletions
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
    patchShebangs .
  '';

-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libcddb ncurses help2man ]
+  nativeBuildInputs = [ pkgconfig help2man ];
+  buildInputs = [ libcddb ncurses ]
    ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Carbon IOKit ];

  doCheck = !stdenv.isDarwin;