From ef6b76ca7d38dac843f3629f9973641d4efb9417 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sun, 19 Aug 2018 09:15:45 +0200 Subject: 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 --- pkgs/development/libraries/ntl/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'pkgs/development/libraries/ntl') 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}" -- cgit 1.4.1