diff options
author | Joel Taylor <me@joelt.io> | 2014-08-17 13:17:13 -0700 |
---|---|---|
committer | Joel Taylor <me@joelt.io> | 2014-09-09 13:54:24 -0700 |
commit | 3e8344d334d42824ac3061a919ac15b19a1bf21d (patch) | |
tree | 5ecad4218357caec8ddc27d5df150a5734db0281 /pkgs/applications/version-management | |
parent | e3fd4499ef296f4769cf4e9e91f1ccfd16325b0f (diff) | |
download | nixlib-3e8344d334d42824ac3061a919ac15b19a1bf21d.tar nixlib-3e8344d334d42824ac3061a919ac15b19a1bf21d.tar.gz nixlib-3e8344d334d42824ac3061a919ac15b19a1bf21d.tar.bz2 nixlib-3e8344d334d42824ac3061a919ac15b19a1bf21d.tar.lz nixlib-3e8344d334d42824ac3061a919ac15b19a1bf21d.tar.xz nixlib-3e8344d334d42824ac3061a919ac15b19a1bf21d.tar.zst nixlib-3e8344d334d42824ac3061a919ac15b19a1bf21d.zip |
suitable clang stdenv
Diffstat (limited to 'pkgs/applications/version-management')
-rw-r--r-- | pkgs/applications/version-management/subversion/default.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 283ea7591538..30283ad387c8 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -15,7 +15,7 @@ assert httpServer -> httpd != null; assert pythonBindings -> swig != null && python != null; assert javahlBindings -> jdk != null && perl != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { version = "1.8.10"; @@ -73,14 +73,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # Hack to build on Mac OS X. The system header files use C99-style - # comments, but Subversion passes -std=c90. - NIX_CFLAGS_COMPILE = "-std=c99"; - meta = { description = "A version control system intended to be a compelling replacement for CVS in the open source community"; homepage = http://subversion.apache.org/; maintainers = with stdenv.lib.maintainers; [ eelco lovek323 ]; hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; -} +} // stdenv.lib.optionalAttrs stdenv.isDarwin { + CXX = "clang++"; + CC = "clang"; + CPP = "clang -E"; + CXXCPP = "clang++ -E"; +}) |