JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #42855 from Infinisil/idris-gcc

Browse Source 
Idris: Wrap with IDRIS_CC
This commit is contained in:
Silvan Mosberger 2018-07-04 12:49:59 +02:00 committed by GitHub
commit 45f8c2ac29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/idris-modules/default.nix
View File

@ -31,10 +31,9 @@
# Idris wrapper with specified compiler and library paths, used to build packages # Idris wrapper with specified compiler and library paths, used to build packages
idris = idris = pkgs.callPackage ./idris-wrapper.nix {
(pkgs.callPackage ./idris-wrapper.nix {}) inherit idris-no-deps;
idris-no-deps };
{ path = [ pkgs.gcc ]; lib = [pkgs.gmp]; };
# Utilities for building packages # Utilities for building packages

16
pkgs/development/idris-modules/idris-wrapper.nix
View File

@ -1,14 +1,12 @@
{ symlinkJoin, makeWrapper, stdenv }: idris: { path, lib }: { lib, symlinkJoin, makeWrapper, idris-no-deps, gcc, gmp }:
symlinkJoin { symlinkJoin {
name = idris.name; inherit (idris-no-deps) name src meta;
src = idris.src; paths = [ idris-no-deps ];
paths = [ idris ];
buildInputs = [ makeWrapper ]; buildInputs = [ makeWrapper ];
meta.platforms = idris.meta.platforms;
postBuild = '' postBuild = ''
wrapProgram $out/bin/idris \ wrapProgram $out/bin/idris \
--suffix PATH : ${ stdenv.lib.makeBinPath path } \ --run 'export IDRIS_CC=''${IDRIS_CC:-${lib.getBin gcc}/bin/gcc}' \
--suffix LIBRARY_PATH : ${stdenv.lib.makeLibraryPath lib} --suffix LIBRARY_PATH : ${lib.makeLibraryPath [ gmp ]}
''; '';
} }