diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-10-20 06:05:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-20 06:05:55 +0000 |
| commit | 6e9b36d7a046336cbde184b9b1c1a6939d054aee (patch) | |
| tree | 383f6dba312c70701c8a09d110f0ad1e096a30cb /pkgs/applications/version-management | |
| parent | 0eb4236f51ce7e2c111e54b42898142be3210648 (diff) | |
| parent | 260eb420a2e55e3a0411e731b933c3a8bf6b778e (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/rapidsvn/default.nix | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix index bcb90c20698b7..4bede0ac82b68 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, python3, fetchpatch }: +{ lib, stdenv, fetchurl, wxGTK30-gtk3, subversion, apr, aprutil, python3, fetchpatch }: stdenv.mkDerivation rec { pname = "rapidsvn"; @@ -9,12 +9,14 @@ stdenv.mkDerivation rec { sha256 = "1bmcqjc12k5w0z40k7fkk8iysqv4fw33i80gvcmbakby3d4d4i4p"; }; - buildInputs = [ wxGTK subversion apr aprutil python3 ]; + buildInputs = [ wxGTK30-gtk3 subversion apr aprutil python3 ]; NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; - configureFlags = [ "--with-svn-include=${subversion.dev}/include" - "--with-svn-lib=${subversion.out}/lib" ]; + configureFlags = [ + "--with-svn-include=${subversion.dev}/include" + "--with-svn-lib=${subversion.out}/lib" + ]; patches = [ ./fix-build.patch @@ -31,6 +33,11 @@ stdenv.mkDerivation rec { 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="; + }) ]; meta = { |