diff options
author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-08-22 19:49:25 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-08-23 06:45:32 -0500 |
commit | b438d394ceb1273de5838b1d6dc81fa46cb30381 (patch) | |
tree | 0b1cecfa8115b99df6b61a35581dc2223f5d8f03 /pkgs/development | |
parent | ca381067e77f01b875cacdee3fe0934c87b89bda (diff) | |
download | nixlib-b438d394ceb1273de5838b1d6dc81fa46cb30381.tar nixlib-b438d394ceb1273de5838b1d6dc81fa46cb30381.tar.gz nixlib-b438d394ceb1273de5838b1d6dc81fa46cb30381.tar.bz2 nixlib-b438d394ceb1273de5838b1d6dc81fa46cb30381.tar.lz nixlib-b438d394ceb1273de5838b1d6dc81fa46cb30381.tar.xz nixlib-b438d394ceb1273de5838b1d6dc81fa46cb30381.tar.zst nixlib-b438d394ceb1273de5838b1d6dc81fa46cb30381.zip |
idrisPackages.idris: 1.0 -> 1.1.1
Diffstat (limited to 'pkgs/development')
3 files changed, 17 insertions, 8 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8ab751166c5e..9f05dd4720d7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -697,6 +697,11 @@ self: super: { # test suite cannot find its own "idris" binary idris = doJailbreak (dontCheck super.idris); + idris_1_1_1 = overrideCabal (doJailbreak (dontCheck super.idris_1_1_1)) (drv: { + # The standard libraries are compiled separately + configureFlags = (drv.configureFlags or []) ++ [ "-fexeconly" ]; + }); + # https://github.com/bos/math-functions/issues/25 math-functions = dontCheck super.math-functions; diff --git a/pkgs/development/idris-modules/build-builtin-package.nix b/pkgs/development/idris-modules/build-builtin-package.nix index defe87654034..6de3f8b16669 100644 --- a/pkgs/development/idris-modules/build-builtin-package.nix +++ b/pkgs/development/idris-modules/build-builtin-package.nix @@ -13,8 +13,11 @@ build-idris-package { inherit (idris) src; postUnpack = '' - mv $sourceRoot/libs/${name} $IDRIS_LIBRARY_PATH - sourceRoot=$IDRIS_LIBRARY_PATH/${name} + sourceRoot=$sourceRoot/libs/${name} + ''; + + postPatch = '' + sed -i ${name}.ipkg -e "/^opts/ s|-i \\.\\./|-i $IDRIS_LIBRARY_PATH/|g" ''; meta = idris.meta // { diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix index a00f5e74b845..9dfa3430ed8b 100644 --- a/pkgs/development/idris-modules/build-idris-package.nix +++ b/pkgs/development/idris-modules/build-idris-package.nix @@ -4,8 +4,13 @@ # name and src. { stdenv, idris, gmp }: args: stdenv.mkDerivation ({ preHook = '' - mkdir idris-libs + # Library import path export IDRIS_LIBRARY_PATH=$PWD/idris-libs + mkdir -p $IDRIS_LIBRARY_PATH + + # Library install path + export IBCSUBDIR=$out/lib/${idris.name} + mkdir -p $IBCSUBDIR addIdrisLibs () { if [ -d $1/lib/${idris.name} ]; then @@ -16,10 +21,6 @@ envHooks+=(addIdrisLibs) ''; - configurePhase = '' - export TARGET=$out/lib/${idris.name} - ''; - buildPhase = '' ${idris}/bin/idris --build *.ipkg ''; @@ -33,7 +34,7 @@ ''; installPhase = '' - ${idris}/bin/idris --install *.ipkg + ${idris}/bin/idris --install *.ipkg --ibcsubdir $IBCSUBDIR ''; buildInputs = [ gmp ]; |