Merge master into staging-next

3 files changed, 21 insertions, 35 deletions

diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix
index 21b2d117558bf..00b8dac9105d2 100644
--- a/pkgs/development/libraries/freeglut/default.nix
+++ b/pkgs/development/libraries/freeglut/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, libXi, libXrandr, libXxf86vm, libGL, libGLU, xlibsWrapper, cmake }:
+{ lib, stdenv, fetchurl, libICE, libXext, libXi, libXrandr, libXxf86vm, libGL, libGLU, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "freeglut";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ libXi libXrandr libXxf86vm libGL libGLU xlibsWrapper ];
+  buildInputs = [ libICE libXext libXi libXrandr libXxf86vm libGL libGLU ];
 
   cmakeFlags = lib.optionals stdenv.isDarwin [
                  "-DOPENGL_INCLUDE_DIR=${libGL}/include"
diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix
index faa338c94fcfd..28b81867d2036 100644
--- a/pkgs/development/libraries/physfs/default.nix
+++ b/pkgs/development/libraries/physfs/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, cmake, doxygen, zlib, Foundation, Carbon }:
+{ lib, stdenv, fetchFromGitHub, cmake, doxygen, zlib, Foundation }:
 
 let
   generic = version: sha256:
@@ -6,19 +6,17 @@ let
     pname = "physfs";
     inherit version;
 
-    src = fetchurl {
-      url = "${meta.homepage}/downloads/${pname}-${version}.tar.bz2";
+    src = fetchFromGitHub {
+      owner = "icculus";
+      repo = "physfs";
+      rev = "release-${version}";
       inherit sha256;
     };
 
     nativeBuildInputs = [ cmake doxygen ];
 
     buildInputs = [ zlib ]
-      ++ lib.optionals stdenv.isDarwin [ Foundation Carbon ];
-
-    patchPhase = ''
-      sed s,-Werror,, -i CMakeLists.txt
-    '';
+      ++ lib.optionals stdenv.isDarwin [ Foundation ];
 
     doInstallCheck = true;
 
@@ -27,14 +25,15 @@ let
     '';
 
     meta = with lib; {
-      homepage = "http://icculus.org/physfs/";
+      homepage = "https://icculus.org/physfs/";
       description = "Library to provide abstract access to various archives";
-      license = licenses.free;
-      platforms = platforms.unix;
+      changelog = "https://github.com/icculus/physfs/releases/tag/release-${version}";
+      license = licenses.zlib;
+      platforms = platforms.all;
     };
   };
 
 in {
-  physfs_2 = generic "2.0.3" "0sbbyqzqhyf0g68fcvvv20n3928j0x6ik1njmhn1yigvq2bj11na";
-  physfs   = generic "3.0.2" "0qzqz4r88gvd8m7sh2z5hvqcr0jfr4wb2f77c19xycyn0rigfk9h";
+  physfs_2 = generic "2.1.1" "sha256-hmS/bfszit3kD6B2BjnuV50XKueq2GcRaqyAKLkvfLc=";
+  physfs   = generic "3.2.0" "sha256-FhFIshX7G3uHEzvHGlDIrXa7Ux6ThQNzVssaENs+JMw=";
 }
diff --git a/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/pkgs/development/libraries/wxwidgets/wxGTK31.nix
index d84c8a5aa5e48..af673695ace50 100644
--- a/pkgs/development/libraries/wxwidgets/wxGTK31.nix
+++ b/pkgs/development/libraries/wxwidgets/wxGTK31.nix
@@ -4,7 +4,6 @@
 , fetchurl
 , gnome2
 , gst_all_1
-, gtk2
 , gtk3
 , libGL
 , libGLU
@@ -18,7 +17,6 @@
 , compat30 ? true
 , unicode ? true
 , withEGL ? true
-, withGtk2 ? (!stdenv.isDarwin)
 , withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
 , withWebKit ? stdenv.isDarwin
 , webkitgtk
@@ -33,11 +31,6 @@
 , WebKit
 }:
 
-assert withGtk2 -> (!withWebKit);
-
-let
-  gtk = if withGtk2 then gtk2 else gtk3;
-in
 stdenv.mkDerivation rec {
   pname = "wxwidgets";
   version = "3.1.5";
@@ -60,18 +53,14 @@ stdenv.mkDerivation rec {
   buildInputs = [
     gst_all_1.gst-plugins-base
     gst_all_1.gstreamer
-  ]
-  ++ lib.optionals (!stdenv.isDarwin) [
-    gtk
+  ] ++ lib.optionals (!stdenv.isDarwin) [
+    gtk3
     libSM
     libXinerama
     libXtst
     libXxf86vm
     xorgproto
   ]
-  ++ lib.optionals withGtk2 [
-    gnome2.GConf
-  ]
   ++ lib.optional withMesa libGLU
   ++ lib.optional (withWebKit && !stdenv.isDarwin) webkitgtk
   ++ lib.optional (withWebKit && stdenv.isDarwin) WebKit
@@ -102,8 +91,7 @@ stdenv.mkDerivation rec {
   ++ lib.optionals stdenv.isDarwin [
     "--with-osx_cocoa"
     "--with-libiconv"
-  ]
-  ++ lib.optionals withWebKit [
+  ] ++ lib.optionals withWebKit [
     "--enable-webview"
     "--enable-webviewwebkit"
   ];
@@ -133,6 +121,10 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  passthru = {
+    inherit compat28 compat30 unicode;
+  };
+
   meta = with lib; {
     homepage = "https://www.wxwidgets.org/";
     description = "A Cross-Platform C++ GUI Library";
@@ -150,9 +142,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ tfmoraes ];
     platforms = platforms.unix;
   };
-
-  passthru = {
-    inherit gtk;
-    inherit compat28 compat30 unicode;
-  };
 }