summary refs log tree commit diff
path: root/pkgs/development/libraries/ntl
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2018-08-19 09:15:45 +0200
committerVladimír Čunát <vcunat@gmail.com>2018-08-19 09:15:45 +0200
commitef6b76ca7d38dac843f3629f9973641d4efb9417 (patch)
tree005c23fa97795d2fb9644bac04487a06bb6c66a6 /pkgs/development/libraries/ntl
parentcbf53f62a6e6670c706c3180320be70cd71610cb (diff)
downloadnixpkgs-ef6b76ca7d38dac843f3629f9973641d4efb9417.tar
nixpkgs-ef6b76ca7d38dac843f3629f9973641d4efb9417.tar.gz
nixpkgs-ef6b76ca7d38dac843f3629f9973641d4efb9417.tar.bz2
nixpkgs-ef6b76ca7d38dac843f3629f9973641d4efb9417.tar.lz
nixpkgs-ef6b76ca7d38dac843f3629f9973641d4efb9417.tar.xz
nixpkgs-ef6b76ca7d38dac843f3629f9973641d4efb9417.tar.zst
nixpkgs-ef6b76ca7d38dac843f3629f9973641d4efb9417.zip
ntl: use a more "stable" fix for clang platforms
Always passing the configuration option should be simple and reliable.
See comments on https://github.com/NixOS/nixpkgs/commit/1bfbe76772b731
Diffstat (limited to 'pkgs/development/libraries/ntl')
-rw-r--r--pkgs/development/libraries/ntl/default.nix5
1 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix
index ad153c862af..63a51a90ccd 100644
--- a/pkgs/development/libraries/ntl/default.nix
+++ b/pkgs/development/libraries/ntl/default.nix
@@ -21,10 +21,6 @@ stdenv.mkDerivation rec {
     sha256 = "1pcib3vz1sdqlk0n561wbf7fwq44jm5cpx710w4vqljxgrjd7q1s";
   };
 
-  patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
-    substituteInPlace DoConfig --replace g++ c++
-  '';
-
   buildInputs = [
     gmp
   ];
@@ -52,6 +48,7 @@ stdenv.mkDerivation rec {
       else
         "generic" # "chooses options that should be OK for most platforms"
     }"
+    "CXX=c++"
   ] ++ lib.optionals withGf2x [
     "NTL_GF2X_LIB=on"
     "GF2X_PREFIX=${gf2x}"