nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 17:03:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

rapidsvn: fix the build and use Python 3

Browse Source 
Moved back to C++14 where dynamic exception specifications are deprecated but still present.

ZHF: #172160
This commit is contained in:
Thomas Gerbet 2022-05-11 12:15:59 +02:00
parent 12697a1621
commit 05f976210a
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/applications/version-management/rapidsvn/default.nix
View File

@ -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;
};
}