diff options
| author | Silvan Mosberger <infinisil@icloud.com> | 2018-07-02 02:32:47 +0200 |
|---|---|---|
| committer | Silvan Mosberger <infinisil@icloud.com> | 2018-07-02 02:35:46 +0200 |
| commit | 636cd3cba96d422cd91340ec19377769261f8e64 (patch) | |
| tree | 820151fd4d6a91479076f67ac1b3d42179e8fe47 /pkgs/development/idris-modules | |
| parent | b6cfa372f09b908866878df006e2a65c5a865280 (diff) | |
| download | nixpkgs-636cd3cba96d422cd91340ec19377769261f8e64.tar nixpkgs-636cd3cba96d422cd91340ec19377769261f8e64.tar.gz nixpkgs-636cd3cba96d422cd91340ec19377769261f8e64.tar.bz2 nixpkgs-636cd3cba96d422cd91340ec19377769261f8e64.tar.lz nixpkgs-636cd3cba96d422cd91340ec19377769261f8e64.tar.xz nixpkgs-636cd3cba96d422cd91340ec19377769261f8e64.tar.zst nixpkgs-636cd3cba96d422cd91340ec19377769261f8e64.zip | |
idris: Clean up wrapper
Diffstat (limited to 'pkgs/development/idris-modules')
| -rw-r--r-- | pkgs/development/idris-modules/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/idris-modules/idris-wrapper.nix | 17 |
2 files changed, 10 insertions, 14 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 5699f8b61b6..f395bcd95d7 100644 --- a/pkgs/development/idris-modules/idris-wrapper.nix +++ b/pkgs/development/idris-modules/idris-wrapper.nix @@ -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 ]} + ''; +} |