From 6db6dea4c9ae24953ff0df16c706e322b20ea594 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 24 Sep 2014 18:55:07 +0200 Subject: [PATCH] subversion: Remove apparently unnecessary environment variables At least it seems to build fine (and use clang) without them. --- .../version-management/subversion/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 7bf491a0b16..ff19b0af16f 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"; @@ -77,9 +77,4 @@ 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"; -}) +}