Merge staging into staging-next

2021-03-08 19:20:18 +01:00
parent 6ba8f344c6 042adf08d1
commit 277d488026
374 changed files with 3871 additions and 2493 deletions
@@ -51,8 +51,8 @@ in stdenv.mkDerivation rec {

  patches = [ ./40103-iostat-fix.patch ];

+  nativeBuildInputs = [ unzip ];
  buildInputs = [
-    unzip
    makeWrapper
  ] ++ (with python'.pkgs; [
    requests
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
    url = "http://tarballs.nixos.org/Azureus2.3.0.6.jar";
    sha256 = "1hwrh3n0b0jbpsdk15zrs7pw175418phhmg6pn4xi1bvilxq1wrd";
  };
-#  buildInputs = [unzip];
+
  inherit jdk swt;

  meta = {