Merge pull request #112095 from NixOS/staging-next

Staging next
2021-02-18 08:50:07 +01:00
parent 4ef6da455e 45dc900af9
commit 2a78ea9435
214 changed files with 5318 additions and 875 deletions
@@ -15,6 +15,8 @@ let
      nativeBuildInputs = [ pkg-config gcc-arm-embedded ];
      buildInputs = [ ncurses readline pcsclite qt5.qtbase ];

+      dontWrapQtApps = true;
+
      postPatch = ''
        substituteInPlace client/Makefile --replace '-ltermcap' ' '
        substituteInPlace liblua/Makefile --replace '-ltermcap' ' '