idris: Clean up wrapper
This commit is contained in:
parent
b6cfa372f0
commit
636cd3cba9
|
@ -31,10 +31,9 @@
|
|||
|
||||
# Idris wrapper with specified compiler and library paths, used to build packages
|
||||
|
||||
idris =
|
||||
(pkgs.callPackage ./idris-wrapper.nix {})
|
||||
idris-no-deps
|
||||
{ path = [ pkgs.gcc ]; lib = [pkgs.gmp]; };
|
||||
idris = pkgs.callPackage ./idris-wrapper.nix {
|
||||
inherit idris-no-deps;
|
||||
};
|
||||
|
||||
# Utilities for building packages
|
||||
|
||||
|
|
|
@ -1,15 +1,12 @@
|
|||
{ symlinkJoin, makeWrapper, stdenv, gcc }: idris: { path, lib }:
|
||||
{ lib, symlinkJoin, makeWrapper, idris-no-deps, gcc, gmp }:
|
||||
|
||||
symlinkJoin {
|
||||
name = idris.name;
|
||||
src = idris.src;
|
||||
paths = [ idris ];
|
||||
inherit (idris-no-deps) name src meta;
|
||||
paths = [ idris-no-deps ];
|
||||
buildInputs = [ makeWrapper ];
|
||||
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}
|
||||
'';
|
||||
}
|
||||
--run 'export IDRIS_CC=''${IDRIS_CC:-${lib.getBin gcc}/bin/gcc}' \
|
||||
--suffix LIBRARY_PATH : ${lib.makeLibraryPath [ gmp ]}
|
||||
'';
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue