Merge pull request #204142 from wegank/fox-aarch64-darwin

fox: 1.7.9 -> 1.7.81, unbreak on aarch64-darwin

pkgs/development/libraries/fox/clang.patch

@@ -1,13 +0,0 @@
-diff --git a/src/FXReactor.cpp b/src/FXReactor.cpp
-index 1ecdb45..9058a30 100644
---- a/src/FXReactor.cpp
-+++ b/src/FXReactor.cpp
-@@ -452,7 +452,7 @@ FXint FXReactor::processActiveHandles(FXTime block,FXuint flags){
-     }
- 
-   // Normal case
--  if(0<=hand){
-+  if(0==hand){
- 
-     // Any handles active?
-     if(0<nhand){

pkgs/development/libraries/fox/default.nix

@@ -1,30 +1,31 @@
 { lib
 , stdenv
 , fetchurl
+, fetchpatch
 , libpng
 , libjpeg
 , libtiff
 , zlib
 , bzip2
+, libGL
+, libGLU
 , libXcursor
 , libXext
 , libXrandr
 , libXft
-, CoreServices ? null
+, CoreServices
 }:
 
 stdenv.mkDerivation rec {
   pname = "fox";
-  version = "1.7.9";
+  version = "1.7.81";
 
   src = fetchurl {
-    url = "ftp://ftp.fox-toolkit.org/pub/${pname}-${version}.tar.gz";
-    sha256 = "1jb9368xsin3ppdf6979n5s7in3s9klbxqbwcp0z8misjixl7nzg";
+    url = "http://fox-toolkit.org/ftp/${pname}-${version}.tar.gz";
+    sha256 = "sha256-bu+IEqNkv9OAf96dPYre3CP759pjalVIbYyc3QSQW2w=";
   };
 
-  patches = [ ./clang.patch ];
-
-  buildInputs = [ libpng libjpeg libtiff zlib bzip2 libXcursor libXext libXrandr libXft ]
+  buildInputs = [ libpng libjpeg libtiff zlib bzip2 libGL libGLU libXcursor libXext libXrandr libXft ]
     ++ lib.optional stdenv.isDarwin CoreServices;
 
   doCheck = true;
@@ -42,9 +43,8 @@ stdenv.mkDerivation rec {
       Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms.
     '';
     homepage = "http://fox-toolkit.org";
-    license = licenses.lgpl3;
+    license = licenses.lgpl3Plus;
     maintainers = [];
-    broken = stdenv.isDarwin && stdenv.isAarch64;
     platforms = platforms.all;
   };
 }

pkgs/top-level/all-packages.nix

@@ -7173,7 +7173,6 @@ with pkgs;
   fortune = callPackage ../tools/misc/fortune { };
 
   fox = callPackage ../development/libraries/fox {
-    libpng = libpng12;
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };