diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-05-02 10:56:28 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-05-02 10:56:28 +0200 |
| commit | 8a854c26473b53829fb326bdcbdfef5b14c3176f (patch) | |
| tree | eae057aaa0e1bc7c681cd63462b46942a6ba3b68 /pkgs/applications | |
| parent | 69d5f27a138ce571df3088ce00dd4a2abee2b3da (diff) | |
| parent | 025ccbccd7a47cc2ce6eac142d8acf619c4cdb9c (diff) | |
| download | nixlib-8a854c26473b53829fb326bdcbdfef5b14c3176f.tar nixlib-8a854c26473b53829fb326bdcbdfef5b14c3176f.tar.gz nixlib-8a854c26473b53829fb326bdcbdfef5b14c3176f.tar.bz2 nixlib-8a854c26473b53829fb326bdcbdfef5b14c3176f.tar.lz nixlib-8a854c26473b53829fb326bdcbdfef5b14c3176f.tar.xz nixlib-8a854c26473b53829fb326bdcbdfef5b14c3176f.tar.zst nixlib-8a854c26473b53829fb326bdcbdfef5b14c3176f.zip | |
Merge pull request #15111 from rardiol/subversionPerl
subversion: fix apr-1 linking related to #14495
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/version-management/subversion/apr-1.patch | 11 | ||||
| -rw-r--r-- | pkgs/applications/version-management/subversion/default.nix | 2 |
2 files changed, 13 insertions, 0 deletions
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 000000000000..240d94f3f977 --- /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 da21c29e6f9f..fc87aea08a4f 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"} |