From b6cfa372f09b908866878df006e2a65c5a865280 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 2 Jul 2018 01:51:03 +0200 Subject: idris: Wrap with IDRIS_CC Previously idris used the C compiler from PATH for the C backend, which means that the results and whether it even succeeds can vary between systems (e.g. if a Nix-built Idris was used on a super old Linux system, the cc installed there might not even work for Idris' C). To make this more predictable, this commit sets the IDRIS_CC env var, which Idris will prefer over searching in PATH, to a Nix-provided gcc executable, given that it is not already set, so it's still possible to override. --- pkgs/development/idris-modules/idris-wrapper.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/development/idris-modules') diff --git a/pkgs/development/idris-modules/idris-wrapper.nix b/pkgs/development/idris-modules/idris-wrapper.nix index fcd02c4da24..5699f8b61b6 100644 --- a/pkgs/development/idris-modules/idris-wrapper.nix +++ b/pkgs/development/idris-modules/idris-wrapper.nix @@ -1,4 +1,4 @@ -{ symlinkJoin, makeWrapper, stdenv }: idris: { path, lib }: +{ symlinkJoin, makeWrapper, stdenv, gcc }: idris: { path, lib }: symlinkJoin { name = idris.name; @@ -8,6 +8,7 @@ symlinkJoin { meta.platforms = idris.meta.platforms; postBuild = '' wrapProgram $out/bin/idris \ + --run 'export IDRIS_CC=''${IDRIS_CC:-${stdenv.lib.getBin gcc}/bin/gcc}' \ --suffix PATH : ${ stdenv.lib.makeBinPath path } \ --suffix LIBRARY_PATH : ${stdenv.lib.makeLibraryPath lib} ''; -- cgit 1.4.1