diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-23 09:02:10 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-23 09:02:10 +0200 |
| commit | 0b192a09767c05b38f3e2838c07e9600318bbbb5 (patch) | |
| tree | 4467053c39ef4bad71527cd5fda5cf92960575e8 /pkgs/applications/version-management/subversion/default.nix | |
| parent | dc5bbc4700dd95420f87141efcc0e6cb48a710f9 (diff) | |
| parent | 0e54c749114b79f6be78486086f5829b176fcba8 (diff) | |
| download | nixlib-0b192a09767c05b38f3e2838c07e9600318bbbb5.tar nixlib-0b192a09767c05b38f3e2838c07e9600318bbbb5.tar.gz nixlib-0b192a09767c05b38f3e2838c07e9600318bbbb5.tar.bz2 nixlib-0b192a09767c05b38f3e2838c07e9600318bbbb5.tar.lz nixlib-0b192a09767c05b38f3e2838c07e9600318bbbb5.tar.xz nixlib-0b192a09767c05b38f3e2838c07e9600318bbbb5.tar.zst nixlib-0b192a09767c05b38f3e2838c07e9600318bbbb5.zip | |
Merge branch 'master' into staging
That's to get mesa rebuild from master, as it's nontrivial.
Diffstat (limited to 'pkgs/applications/version-management/subversion/default.nix')
| -rw-r--r-- | pkgs/applications/version-management/subversion/default.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 0a5b2c0d74b8..e0c7030a762f 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -37,6 +37,10 @@ let patches = [ ./apr-1.patch ]; + # SVN build seems broken on gcc5: + # https://gcc.gnu.org/gcc-5/porting_to.html + CPPFLAGS = "-P"; + configureFlags = '' ${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"} ${if httpServer then "--with-apxs=${apacheHttpd.dev}/bin/apxs" else "--without-apxs"} |