rapidsvn: 0.12.1 -> unstable-2021-08-02

pkgs/applications/version-management/rapidsvn/default.nix

@@ -1,44 +1,51 @@
-{ lib, stdenv, fetchurl, wxGTK30, subversion, apr, aprutil, python3, fetchpatch }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, wxGTK32
+, subversion
+, apr
+, aprutil
+, python3
+, darwin
+}:
 
 stdenv.mkDerivation rec {
   pname = "rapidsvn";
-  version = "0.12.1";
+  version = "unstable-2021-08-02";
 
-  src = fetchurl {
-    url = "http://www.rapidsvn.org/download/release/${version}/${pname}-${version}.tar.gz";
-    sha256 = "1bmcqjc12k5w0z40k7fkk8iysqv4fw33i80gvcmbakby3d4d4i4p";
+  src = fetchFromGitHub {
+    owner = "RapidSVN";
+    repo = "RapidSVN";
+    rev = "3a564e071c3c792f5d733a9433b9765031f8eed0";
+    hash = "sha256-6bQTHAOZAP+06kZDHjDx9VnGm4vrZUDyLHZdTpiyP08=";
   };
 
-  buildInputs = [ wxGTK30 subversion apr aprutil python3 ];
+  postPatch = ''
+    substituteInPlace configure.ac \
+      --replace "[3.0.*]" "[3.*]"
+  '';
 
-  env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ];
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
+
+  buildInputs = [
+    wxGTK32
+    subversion
+    apr
+    aprutil
+    python3
+  ] ++ lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.Cocoa
+  ];
 
   configureFlags = [
     "--with-svn-include=${subversion.dev}/include"
     "--with-svn-lib=${subversion.out}/lib"
   ];
 
-  patches = [
-    ./fix-build.patch
-    # Python 3 compatibility patches
-    (fetchpatch {
-      url = "https://github.com/RapidSVN/RapidSVN/pull/44/commits/2e26fd5d6a413d6c3a055c17ac4840b95d1537e9.patch";
-      hash = "sha256-8acABzscgZh1bfAt35KHfU+nfaiO7P1b+lh34Bj0REI=";
-    })
-    (fetchpatch {
-      url = "https://github.com/RapidSVN/RapidSVN/pull/44/commits/92927af764f92b3731333ed3dba637f98611167a.patch";
-      hash = "sha256-4PdShGcfFwxjdI3ygbnKFAa8l9dGERq/xSl54WisgKM=";
-    })
-    (fetchpatch {
-      url = "https://github.com/RapidSVN/RapidSVN/pull/44/commits/3e375f11d94cb8faddb8b7417354a9fb51f304ec.patch";
-      hash = "sha256-BUpCMEH7jctOLtJktDUE52bxexfLemLItZ0IgdAnq9g=";
-    })
-    # wxWidgets 3.0 compatibility patches
-    (fetchpatch {
-      url = "https://sources.debian.org/data/main/r/rapidsvn/0.12.1dfsg-3.1/debian/patches/wx3.0.patch";
-      sha256 = "sha256-/07+FoOrNw/Pc+wlVt4sGOITfIIEu8ZbI3/ym0u8bs4=";
-    })
-  ];
+  env.NIX_CFLAGS_COMPILE = "-std=c++14";
 
   meta = {
     description = "Multi-platform GUI front-end for the Subversion revision system";
@@ -46,6 +53,5 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl3Plus;
     maintainers = [ lib.maintainers.viric ];
     platforms = lib.platforms.unix;
-    broken = stdenv.isDarwin;
   };
 }