Merge branch 'master' into staging-next

; Conflicts:
;	pkgs/development/lisp-modules-new/ql.nix

2 files changed, 11 insertions, 9 deletions

diff --git a/pkgs/development/interpreters/bats/libraries.nix b/pkgs/development/interpreters/bats/libraries.nix
index 74324b03e6add..ef0b40c31b7c8 100644
--- a/pkgs/development/interpreters/bats/libraries.nix
+++ b/pkgs/development/interpreters/bats/libraries.nix
@@ -10,8 +10,9 @@
     };
     dontBuild = true;
     installPhase = ''
-      mkdir -p "$out/share/bats"
-      cp -r . "$out/share/bats/bats-assert"
+      mkdir -p "$out/share/bats/bats-assert"
+      cp load.bash "$out/share/bats/bats-assert"
+      cp -r src "$out/share/bats/bats-assert"
     '';
     meta = {
       description = "Common assertions for Bats";
@@ -33,8 +34,9 @@
     };
     dontBuild = true;
     installPhase = ''
-      mkdir -p "$out/share/bats"
-      cp -r . "$out/share/bats/bats-file"
+      mkdir -p "$out/share/bats/bats-file"
+      cp load.bash "$out/share/bats/bats-file"
+      cp -r src "$out/share/bats/bats-file"
     '';
     meta = {
       description = "Common filesystem assertions for Bats";
@@ -56,8 +58,9 @@
     };
     dontBuild = true;
     installPhase = ''
-      mkdir -p "$out/share/bats"
-      cp -r . "$out/share/bats/bats-support"
+      mkdir -p "$out/share/bats/bats-support"
+      cp load.bash "$out/share/bats/bats-support"
+      cp -r src "$out/share/bats/bats-support"
     '';
     meta = {
       description = "Supporting library for Bats test helpers";
diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix
index 667fb749d330e..7237d09817ff2 100644
--- a/pkgs/development/interpreters/erlang/generic-builder.nix
+++ b/pkgs/development/interpreters/erlang/generic-builder.nix
@@ -17,7 +17,6 @@
 , libGL ? null
 , libGLU ? null
 , wxGTK ? null
-, wxmac ? null
 , xorg ? null
 , parallelBuild ? false
 , systemd
@@ -72,7 +71,7 @@
 }:
 
 assert wxSupport -> (if stdenv.isDarwin
-then wxmac != null
+then wxGTK != null
 else libGL != null && libGLU != null && wxGTK != null && xorg != null);
 
 assert odbcSupport -> unixODBC != null;
@@ -80,7 +79,7 @@ assert javacSupport -> openjdk11 != null;
 
 let
   inherit (lib) optional optionals optionalAttrs optionalString;
-  wxPackages2 = if stdenv.isDarwin then [ wxmac ] else wxPackages;
+  wxPackages2 = if stdenv.isDarwin then [ wxGTK ] else wxPackages;
 
 in
 stdenv.mkDerivation ({