Merge staging-next into staging

2019-09-19 17:00:07 +02:00
parent d0e3cde9a1 0b12d44c06
commit f81d43b94c
44 changed files with 2345 additions and 1008 deletions
@@ -19,6 +19,11 @@ stdenv.mkDerivation rec {

  patches = [ ./dont_static_link.patch ];

+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace "ar qc" '${stdenv.cc.bintools.targetPrefix}ar qc'
+  '';
+
  preBuild = ''
    patchShebangs scripts
  '';