From eba9d0d8fad0a90fa92d7d447c6e46647d36040a Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Fri, 2 Jan 2015 14:40:31 -0600
Subject: [PATCH] subversion: Add several compiler definitions for Darwin
---
.../version-management/subversion/default.nix | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index 6e329ebdf715..a49e5e1033eb 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -15,7 +15,7 @@ assert httpServer -> apacheHttpd != null;
assert pythonBindings -> swig != null && python != null;
assert javahlBindings -> jdk != null && perl != null;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
version = "1.8.11";
@@ -77,4 +77,9 @@ stdenv.mkDerivation rec {
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";
+})