pyrox.dev
Merge pull request #172540 from LeSuisse/rapidsvn-fix-build-c++14
rapidsvn: fix the build
+19
-2
pkgs/applications/version-management/rapidsvn/default.nix
+19
-2
pkgs/applications/version-management/rapidsvn/default.nix
···
1
-
{ lib, stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python2 }:
2
3
stdenv.mkDerivation rec {
4
pname = "rapidsvn";
···
9
sha256 = "1bmcqjc12k5w0z40k7fkk8iysqv4fw33i80gvcmbakby3d4d4i4p";
10
};
11
12
-
buildInputs = [ wxGTK subversion apr aprutil python2 ];
13
14
configureFlags = [ "--with-svn-include=${subversion.dev}/include"
15
"--with-svn-lib=${subversion.out}/lib" ];
16
17
patches = [
18
./fix-build.patch
19
];
20
21
meta = {
···
23
homepage = "http://rapidsvn.tigris.org/";
24
license = lib.licenses.gpl3Plus;
25
maintainers = [ lib.maintainers.viric ];
26
};
27
}
···
1
+
{ lib, stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python3, fetchpatch }:
2
3
stdenv.mkDerivation rec {
4
pname = "rapidsvn";
···
9
sha256 = "1bmcqjc12k5w0z40k7fkk8iysqv4fw33i80gvcmbakby3d4d4i4p";
10
};
11
12
+
buildInputs = [ wxGTK subversion apr aprutil python3 ];
13
+
14
+
NIX_CFLAGS_COMPILE = [ "-std=c++14" ];
15
16
configureFlags = [ "--with-svn-include=${subversion.dev}/include"
17
"--with-svn-lib=${subversion.out}/lib" ];
18
19
patches = [
20
./fix-build.patch
21
+
# Python 3 compatibility patches
22
+
(fetchpatch {
23
+
url = "https://github.com/RapidSVN/RapidSVN/pull/44/commits/2e26fd5d6a413d6c3a055c17ac4840b95d1537e9.patch";
24
+
hash = "sha256-8acABzscgZh1bfAt35KHfU+nfaiO7P1b+lh34Bj0REI=";
25
+
})
26
+
(fetchpatch {
27
+
url = "https://github.com/RapidSVN/RapidSVN/pull/44/commits/92927af764f92b3731333ed3dba637f98611167a.patch";
28
+
hash = "sha256-4PdShGcfFwxjdI3ygbnKFAa8l9dGERq/xSl54WisgKM=";
29
+
})
30
+
(fetchpatch {
31
+
url = "https://github.com/RapidSVN/RapidSVN/pull/44/commits/3e375f11d94cb8faddb8b7417354a9fb51f304ec.patch";
32
+
hash = "sha256-BUpCMEH7jctOLtJktDUE52bxexfLemLItZ0IgdAnq9g=";
33
+
})
34
];
35
36
meta = {
···
38
homepage = "http://rapidsvn.tigris.org/";
39
license = lib.licenses.gpl3Plus;
40
maintainers = [ lib.maintainers.viric ];
41
+
platforms = lib.platforms.unix;
42
+
broken = stdenv.isDarwin;
43
};
44
}