diff options
author | Will Fancher <elvishjerricco@gmail.com> | 2017-08-26 11:39:13 -0400 |
---|---|---|
committer | Will Fancher <elvishjerricco@gmail.com> | 2017-08-26 11:39:13 -0400 |
commit | 4d860389d88d35a702f79c0567cb4c6b1ec0deda (patch) | |
tree | 55ab20bfaf5e227ec2ff09317fcf74a11289c8bf /pkgs/development/idris-modules | |
parent | 05f9db601abd582be51f096affbb97eff49f2ccb (diff) | |
parent | 58dc4a85691343a200c1c4495c1bd839b84c2824 (diff) | |
download | nixlib-4d860389d88d35a702f79c0567cb4c6b1ec0deda.tar nixlib-4d860389d88d35a702f79c0567cb4c6b1ec0deda.tar.gz nixlib-4d860389d88d35a702f79c0567cb4c6b1ec0deda.tar.bz2 nixlib-4d860389d88d35a702f79c0567cb4c6b1ec0deda.tar.lz nixlib-4d860389d88d35a702f79c0567cb4c6b1ec0deda.tar.xz nixlib-4d860389d88d35a702f79c0567cb4c6b1ec0deda.tar.zst nixlib-4d860389d88d35a702f79c0567cb4c6b1ec0deda.zip |
Merge branch 'master' into improved-make-overridable
Diffstat (limited to 'pkgs/development/idris-modules')
-rw-r--r-- | pkgs/development/idris-modules/build-builtin-package.nix | 15 | ||||
-rw-r--r-- | pkgs/development/idris-modules/build-idris-package.nix | 13 |
2 files changed, 18 insertions, 10 deletions
diff --git a/pkgs/development/idris-modules/build-builtin-package.nix b/pkgs/development/idris-modules/build-builtin-package.nix index 95641a8f9fa1..6de3f8b16669 100644 --- a/pkgs/development/idris-modules/build-builtin-package.nix +++ b/pkgs/development/idris-modules/build-builtin-package.nix @@ -1,16 +1,23 @@ # Build one of the packages that come with idris # name: The name of the package # deps: The dependencies of the package -{ idris, build-idris-package, lib }: name: deps: build-idris-package { - inherit name; +{ idris, build-idris-package, lib }: name: deps: +let + inherit (builtins.parseDrvName idris.name) version; +in +build-idris-package { + name = "${name}-${version}"; propagatedBuildInputs = deps; 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 ]; |