Browse Source

subversion: fix apr-1 linking

nixos-19.03
Ricardo Ardissone 6 years ago
parent
commit
025ccbccd7
  1. 11
      pkgs/applications/version-management/subversion/apr-1.patch
  2. 2
      pkgs/applications/version-management/subversion/default.nix

11
pkgs/applications/version-management/subversion/apr-1.patch

@ -0,0 +1,11 @@
--- a/subversion/bindings/swig/perl/native/Makefile.PL.in
+++ b/subversion/bindings/swig/perl/native/Makefile.PL.in
@@ -72,7 +72,7 @@
# According to the log of r7937, the flags guarded by the conditional break
# the build on FreeBSD if not conditionalized.
my $apr_ldflags = '@SVN_APR_LIBS@'
- if $^O eq 'darwin' or $^O eq 'cygwin';
+ if $^O eq 'darwin' or $^O eq 'cygwin' or $^O eq 'linux';
chomp $apr_shlib_path_var;

2
pkgs/applications/version-management/subversion/default.nix

@ -35,6 +35,8 @@ let
++ stdenv.lib.optional perlBindings perl
++ stdenv.lib.optional saslSupport sasl;
patches = [ ./apr-1.patch ];
configureFlags = ''
${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"}
${if httpServer then "--with-apxs=${apacheHttpd}/bin/apxs" else "--without-apxs"}

Loading…
Cancel
Save