diff options
author | Silvan Mosberger <infinisil@icloud.com> | 2018-07-04 12:49:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-04 12:49:59 +0200 |
commit | 45f8c2ac29c28060d284318baf0565c13b2b131f (patch) | |
tree | 2c9cc8a9cf3abe2fe4f6b8184ecae1603761c37a | |
parent | c3b294855fdee5fc4de330cb648074855218ed0c (diff) | |
parent | 636cd3cba96d422cd91340ec19377769261f8e64 (diff) | |
download | nixpkgs-45f8c2ac29c28060d284318baf0565c13b2b131f.tar nixpkgs-45f8c2ac29c28060d284318baf0565c13b2b131f.tar.gz nixpkgs-45f8c2ac29c28060d284318baf0565c13b2b131f.tar.bz2 nixpkgs-45f8c2ac29c28060d284318baf0565c13b2b131f.tar.lz nixpkgs-45f8c2ac29c28060d284318baf0565c13b2b131f.tar.xz nixpkgs-45f8c2ac29c28060d284318baf0565c13b2b131f.tar.zst nixpkgs-45f8c2ac29c28060d284318baf0565c13b2b131f.zip |
Merge pull request #42855 from Infinisil/idris-gcc
Idris: Wrap with IDRIS_CC
-rw-r--r-- | pkgs/development/idris-modules/default.nix | 7 | ||||
-rw-r--r-- | pkgs/development/idris-modules/idris-wrapper.nix | 16 |
2 files changed, 10 insertions, 13 deletions
diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix index 1dfa4e48899..25f8dba00b0 100644 --- a/pkgs/development/idris-modules/default.nix +++ b/pkgs/development/idris-modules/default.nix @@ -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 diff --git a/pkgs/development/idris-modules/idris-wrapper.nix b/pkgs/development/idris-modules/idris-wrapper.nix index fcd02c4da24..f395bcd95d7 100644 --- a/pkgs/development/idris-modules/idris-wrapper.nix +++ b/pkgs/development/idris-modules/idris-wrapper.nix @@ -1,14 +1,12 @@ -{ symlinkJoin, makeWrapper, stdenv }: 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 \ - --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 ]} + ''; +} |