Merge staging-next into staging

2019-06-18 11:07:56 +02:00
parent 4d6f65b81f 41377252e5
commit f120248daf
928 changed files with 2418 additions and 2149 deletions
@@ -114,8 +114,8 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
  passthru = { inherit pkgArches; };
  meta = {
    inherit version platforms;
-    homepage = http://www.winehq.org/;
-    license = "LGPL";
+    homepage = "https://www.winehq.org/";
+    license = with stdenv.lib.licenses; [ lgpl21Plus ];
    description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";
    maintainers = with stdenv.lib.maintainers; [ avnik raskin bendlas ];
  };