diff options
author | Matthew Pickering <matthewtpickering@gmail.com> | 2017-11-02 21:51:35 +0000 |
---|---|---|
committer | Matthew Pickering <matthewtpickering@gmail.com> | 2017-11-02 23:14:12 +0000 |
commit | 40124cd0cf474dd17959b5ae36c8a98112c173c0 (patch) | |
tree | 3f6ad27d72c763a48588cf0023fd1391899bd43e /pkgs/development/idris-modules/default.nix | |
parent | 8e91f4ea91216d68186585d8ab863d4f6133688e (diff) | |
download | nixlib-40124cd0cf474dd17959b5ae36c8a98112c173c0.tar nixlib-40124cd0cf474dd17959b5ae36c8a98112c173c0.tar.gz nixlib-40124cd0cf474dd17959b5ae36c8a98112c173c0.tar.bz2 nixlib-40124cd0cf474dd17959b5ae36c8a98112c173c0.tar.lz nixlib-40124cd0cf474dd17959b5ae36c8a98112c173c0.tar.xz nixlib-40124cd0cf474dd17959b5ae36c8a98112c173c0.tar.zst nixlib-40124cd0cf474dd17959b5ae36c8a98112c173c0.zip |
Add wrapper for idris exe for gcc/gmp runtime deps
Fixes #10450 When compiling packages with -o the executable invokes gcc. There is no compile time flag to control this invocation so for now we create a wrapper which provides the dependency at runtime.
Diffstat (limited to 'pkgs/development/idris-modules/default.nix')
-rw-r--r-- | pkgs/development/idris-modules/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix index 4d7c4928283a..16f6c65b094a 100644 --- a/pkgs/development/idris-modules/default.nix +++ b/pkgs/development/idris-modules/default.nix @@ -1,4 +1,4 @@ -{ pkgs, idris, overrides ? (self: super: {}) }: let +{ pkgs, idris-no-deps, overrides ? (self: super: {}) }: let inherit (pkgs.lib) callPackageWith fix' extends; /* Taken from haskell-modules/default.nix, should probably abstract this away */ @@ -33,7 +33,12 @@ value = callPackage (./. + "/${name}.nix") {}; }) files)) // { - inherit idris callPackage; + inherit idris-no-deps callPackage; + # See #10450 about why we have to wrap the executable + idris = + (pkgs.callPackage ./idris-wrapper.nix {}) + idris-no-deps + { path = [ pkgs.gcc ]; lib = [pkgs.gmp]; }; # A list of all of the libraries that come with idris builtins = pkgs.lib.mapAttrsToList (name: value: value) builtins_; |