From 037e2285227e4b48c318d3711964e0648eaf4955 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 19 May 2023 08:36:57 +0100 Subject: [PATCH] isl_0_24: pull CC_FOR_BUILD Without the change `isl_0_24` build on aarch64-linux fails due to missing $target-gcc wrapper: https://hydra.nixos.org/build/220002237 configure: error: in `/build/isl-0.24': configure: error: C compiler cannot create executables See `config.log' for more details ZHF #230712 --- pkgs/development/libraries/isl/generic.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/isl/generic.nix b/pkgs/development/libraries/isl/generic.nix index fb71a364066..31bd990645b 100644 --- a/pkgs/development/libraries/isl/generic.nix +++ b/pkgs/development/libraries/isl/generic.nix @@ -5,7 +5,12 @@ , patches ? [] }: -{ lib, stdenv, fetchurl, gmp, autoreconfHook +{ lib +, stdenv +, fetchurl +, gmp +, autoreconfHook +, buildPackages }: stdenv.mkDerivation { @@ -19,6 +24,7 @@ stdenv.mkDerivation { inherit patches; strictDeps = true; + depsBuildBuild = lib.optionals (lib.versionAtLeast version "0.24") [ buildPackages.stdenv.cc ]; nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isRiscV && lib.versionOlder version "0.24") [ autoreconfHook ]; buildInputs = [ gmp ];