From 025ccbccd7a47cc2ce6eac142d8acf619c4cdb9c Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Sat, 30 Apr 2016 12:13:26 -0300 Subject: [PATCH] subversion: fix apr-1 linking --- .../version-management/subversion/apr-1.patch | 11 +++++++++++ .../version-management/subversion/default.nix | 2 ++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/applications/version-management/subversion/apr-1.patch diff --git a/pkgs/applications/version-management/subversion/apr-1.patch b/pkgs/applications/version-management/subversion/apr-1.patch new file mode 100644 index 00000000000..240d94f3f97 --- /dev/null +++ b/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; + diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index da21c29e6f9..fc87aea08a4 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/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"}