diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-05-12 13:09:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-12 13:09:15 +0200 |
| commit | b610a3cf3f9b1f3f23cab413b25f86d3c85422fb (patch) | |
| tree | db3dc73b26713342b15eecbfdaadc939d740fd7e | |
| parent | f91da6121a9008bcc2f64f166abf111abd78055e (diff) | |
| parent | 05f976210a24e476cc6f87fd6c069eba44f0e2a3 (diff) | |
Merge pull request #172540 from LeSuisse/rapidsvn-fix-build-c++14
rapidsvn: fix the build
| -rw-r--r-- | pkgs/applications/version-management/rapidsvn/default.nix | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix index 60d011b653d4e..bcb90c20698b7 100644 --- a/pkgs/applications/version-management/rapidsvn/default.nix +++ b/pkgs/applications/version-management/rapidsvn/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python2 }: +{ lib, stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python3, fetchpatch }: stdenv.mkDerivation rec { pname = "rapidsvn"; @@ -9,13 +9,28 @@ stdenv.mkDerivation rec { sha256 = "1bmcqjc12k5w0z40k7fkk8iysqv4fw33i80gvcmbakby3d4d4i4p"; }; - buildInputs = [ wxGTK subversion apr aprutil python2 ]; + buildInputs = [ wxGTK subversion apr aprutil python3 ]; + + NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; 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="; + }) ]; meta = { @@ -23,5 +38,7 @@ stdenv.mkDerivation rec { homepage = "http://rapidsvn.tigris.org/"; license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.viric ]; + platforms = lib.platforms.unix; + broken = stdenv.isDarwin; }; } |