Merge pull request #194682 from wegank/wxformbuilder-bump

pkgs/development/tools/wxformbuilder/default.nix

@@ -1,35 +1,56 @@
-{ lib, stdenv
+{ lib
+, stdenv
 , fetchFromGitHub
-, wxGTK31
-, meson
-, ninja
+, cmake
+, makeWrapper
+, shared-mime-info
+, wxGTK32
+, boost
+, Cocoa
 }:
 
 stdenv.mkDerivation {
   pname = "wxFormBuilder";
-  version = "unstable-2020-08-18";
+  version = "unstable-2022-09-26";
 
   src = fetchFromGitHub {
     owner = "wxFormBuilder";
     repo = "wxFormBuilder";
-    rev = "d053665cc33a79dd935b518b5e7aea6baf493c92";
-    sha256 = "sha256-hTO7Fyp5ZWpq2CfIYEXB85oOkNrqr6Njfh8h0t9B6wU=";
+    rev = "e2e4764f1f4961c654733287c6e84d7738b4ba2b";
     fetchSubmodules = true;
+    sha256 = "sha256-DLdwQH3s/ZNVq+A/qtZRy7dA/Ctp2qkOmi6M+rSb4MM=";
   };
 
   nativeBuildInputs = [
-    ninja
-    meson
+    cmake
+  ] ++ lib.optionals stdenv.isDarwin [
+    makeWrapper
+  ] ++ lib.optionals stdenv.isLinux [
+    shared-mime-info
   ];
 
   buildInputs = [
-    wxGTK31
+    wxGTK32
+    boost
+  ] ++ lib.optionals stdenv.isDarwin [
+    Cocoa
   ];
 
+  preConfigure = ''
+    sed -i 's/FATAL_ERROR/WARNING/' cmake/revision-git*.cmake
+    sed -i '/fixup_bundle/d;/codesign/d' cmake/macros.cmake
+  '';
+
+  postInstall = lib.optionalString stdenv.isDarwin ''
+    mkdir -p $out/{Applications,bin}
+    mv $out/wxFormBuilder.app $out/Applications
+    makeWrapper $out/{Applications/wxFormBuilder.app/Contents/MacOS,bin}/wxFormBuilder
+  '';
+
   meta = with lib; {
     description = "RAD tool for wxWidgets GUI design";
     homepage = "https://github.com/wxFormBuilder/wxFormBuilder";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ matthuszagh ];
+    license = licenses.gpl2Only;
+    maintainers = with maintainers; [ matthuszagh wegank ];
   };
 }

pkgs/top-level/all-packages.nix

@@ -22739,7 +22739,9 @@ with pkgs;
     wt3
     wt4;
 
-  wxformbuilder = callPackage ../development/tools/wxformbuilder { };
+  wxformbuilder = callPackage ../development/tools/wxformbuilder {
+    inherit (darwin.apple_sdk.frameworks) Cocoa;
+  };
 
   wxGTK = wxGTK28;