Merge staging-next into staging

2021-04-30 06:21:40 +00:00
parent 17a8c9c4bf 51b608413c
commit c6548b2832
41 changed files with 1362 additions and 398 deletions
@@ -10,6 +10,11 @@ in stdenv.mkDerivation rec {
    sha256 = "0xjxcxgws3bblybw5zsp9a4naz2v5bs1k3mk8dw00ggc0vwbfivi";
  };

+  # file looks for libgnurx.a when compiling statically
+  postInstall = lib.optionalString stdenv.hostPlatform.isStatic ''
+    ln -s $out/lib/libgnurx{.dll.a,.a}
+  '';
+
  meta = {
    platforms = lib.platforms.windows;
  };