Merge branch 'darwin-fixes2'

2018-12-02 14:15:05 -06:00
parent 5ae9250c3b 820927cb2c
commit 973781444a
9 changed files with 139 additions and 9 deletions
--- a/pkgs/development/libraries/tsocks/default.nix
+++ b/pkgs/development/libraries/tsocks/default.nix
@@ -31,5 +31,6 @@ stdenv.mkDerivation rec {
    license = stdenv.lib.licenses.gpl2;
    maintainers = with maintainers; [ edwtjo phreedom ];
    platforms = platforms.unix;
+    broken = stdenv.hostPlatform.isDarwin;
  };
 }