From cfd2e6731abf7adb361cb01141e77681e498c253 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Tue, 26 Mar 2019 03:49:57 +0100
Subject: [PATCH 1/2] idrisPackages.idris-wrapper: Fix linking to gmp library
This has been broken since 5d18129ce8af9a69312818ea0a5a0029a04a2255,
which updated idris from 1.3.0 to 1.3.1, which included
https://github.com/idris-lang/Idris-dev/pull/4472 as the cause of the
error. I'm still not entirely sure why this broke it though.
This now way should be rather future proof, it uses NIX_CFLAGS to pass
gpm link flags to our CC wrapper directly. The
`NIX_CC_WRAPPER_${stdenv.cc.infixSalt}_TARGET_HOST` part I'm pretty sure
is needed for the CC wrapper to know that those CFLAGS are meant for the
cc running on the HOST.
---
pkgs/development/idris-modules/idris-wrapper.nix | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/idris-modules/idris-wrapper.nix b/pkgs/development/idris-modules/idris-wrapper.nix
index f395bcd95d7..67f5a61eb13 100644
--- a/pkgs/development/idris-modules/idris-wrapper.nix
+++ b/pkgs/development/idris-modules/idris-wrapper.nix
@@ -1,4 +1,4 @@
-{ lib, symlinkJoin, makeWrapper, idris-no-deps, gcc, gmp }:
+{ stdenv, lib, symlinkJoin, makeWrapper, idris-no-deps, gcc, gmp }:
symlinkJoin {
inherit (idris-no-deps) name src meta;
@@ -7,6 +7,8 @@ symlinkJoin {
postBuild = ''
wrapProgram $out/bin/idris \
--run 'export IDRIS_CC=''${IDRIS_CC:-${lib.getBin gcc}/bin/gcc}' \
- --suffix LIBRARY_PATH : ${lib.makeLibraryPath [ gmp ]}
+ --set NIX_CC_WRAPPER_${stdenv.cc.infixSalt}_TARGET_HOST 1 \
+ --prefix NIX_CFLAGS_COMPILE " " "-I${lib.getDev gmp}/include" \
+ --prefix NIX_CFLAGS_LINK " " "-L${lib.getLib gmp}/lib"
'';
}
From 271403c69bc734fde02e8e013be098ca8a926249 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Tue, 26 Mar 2019 04:15:20 +0100
Subject: [PATCH 2/2] idrisPackages.idris-wrapper: Use stdenv's cc instead of
always gcc
This should make it work on Darwin with clang.
---
pkgs/development/idris-modules/idris-wrapper.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/idris-modules/idris-wrapper.nix b/pkgs/development/idris-modules/idris-wrapper.nix
index 67f5a61eb13..4e1d2f9c82e 100644
--- a/pkgs/development/idris-modules/idris-wrapper.nix
+++ b/pkgs/development/idris-modules/idris-wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, symlinkJoin, makeWrapper, idris-no-deps, gcc, gmp }:
+{ stdenv, lib, symlinkJoin, makeWrapper, idris-no-deps, gmp }:
symlinkJoin {
inherit (idris-no-deps) name src meta;
@@ -6,7 +6,7 @@ symlinkJoin {
buildInputs = [ makeWrapper ];
postBuild = ''
wrapProgram $out/bin/idris \
- --run 'export IDRIS_CC=''${IDRIS_CC:-${lib.getBin gcc}/bin/gcc}' \
+ --run 'export IDRIS_CC=''${IDRIS_CC:-${stdenv.cc}/bin/cc}' \
--set NIX_CC_WRAPPER_${stdenv.cc.infixSalt}_TARGET_HOST 1 \
--prefix NIX_CFLAGS_COMPILE " " "-I${lib.getDev gmp}/include" \
--prefix NIX_CFLAGS_LINK " " "-L${lib.getLib gmp}/lib"