diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2018-02-03 10:12:43 +0000 |
|---|---|---|
| committer | Matthew Pickering <matthewtpickering@gmail.com> | 2018-02-07 19:24:31 +0000 |
| commit | 8d55538f973813c8db45e9434bc7f742290a1fd0 (patch) | |
| tree | f9a494c5d0ed6a00a2c48ce20dd0b07454d806fc /pkgs/development/idris-modules | |
| parent | d74a7506f0a1a698f5a66c2878586a08c333caee (diff) | |
| download | nixpkgs-8d55538f973813c8db45e9434bc7f742290a1fd0.tar nixpkgs-8d55538f973813c8db45e9434bc7f742290a1fd0.tar.gz nixpkgs-8d55538f973813c8db45e9434bc7f742290a1fd0.tar.bz2 nixpkgs-8d55538f973813c8db45e9434bc7f742290a1fd0.tar.lz nixpkgs-8d55538f973813c8db45e9434bc7f742290a1fd0.tar.xz nixpkgs-8d55538f973813c8db45e9434bc7f742290a1fd0.tar.zst nixpkgs-8d55538f973813c8db45e9434bc7f742290a1fd0.zip | |
Revert "idris: Move library setup to the setup hook."
This reverts commit 69d4adee1f8b6278a19708a9051f3290f8f13e04.
Diffstat (limited to 'pkgs/development/idris-modules')
| -rw-r--r-- | pkgs/development/idris-modules/build-idris-package.nix | 27 | ||||
| -rw-r--r-- | pkgs/development/idris-modules/idris-wrapper.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/idris-modules/setup-hook.sh | 16 |
3 files changed, 23 insertions, 23 deletions
diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix index 0048634f5b4..66eddd0e360 100644 --- a/pkgs/development/idris-modules/build-idris-package.nix +++ b/pkgs/development/idris-modules/build-idris-package.nix @@ -3,21 +3,40 @@ # args: Additional arguments to pass to mkDerivation. Generally should include at least # name and src. { stdenv, idris, gmp }: args: stdenv.mkDerivation ({ + preHook = '' + # 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 + ln -sv $1/lib/${idris.name}/* $IDRIS_LIBRARY_PATH + fi + } + + # All run-time deps + addEnvHooks 0 addIdrisLibs + ''; + buildPhase = '' - idris --build *.ipkg + ${idris}/bin/idris --build *.ipkg ''; doCheck = true; checkPhase = '' if grep -q test *.ipkg; then - idris --testpkg *.ipkg + ${idris}/bin/idris --testpkg *.ipkg fi ''; installPhase = '' - idris --install *.ipkg --ibcsubdir $IBCSUBDIR + ${idris}/bin/idris --install *.ipkg --ibcsubdir $IBCSUBDIR ''; - buildInputs = [ gmp idris ]; + buildInputs = [ gmp ]; } // args) diff --git a/pkgs/development/idris-modules/idris-wrapper.nix b/pkgs/development/idris-modules/idris-wrapper.nix index 155098a4625..fcd02c4da24 100644 --- a/pkgs/development/idris-modules/idris-wrapper.nix +++ b/pkgs/development/idris-modules/idris-wrapper.nix @@ -10,8 +10,5 @@ symlinkJoin { wrapProgram $out/bin/idris \ --suffix PATH : ${ stdenv.lib.makeBinPath path } \ --suffix LIBRARY_PATH : ${stdenv.lib.makeLibraryPath lib} - - mkdir -p $out/nix-support - substituteAll ${./setup-hook.sh} $out/nix-support/setup-hook ''; } diff --git a/pkgs/development/idris-modules/setup-hook.sh b/pkgs/development/idris-modules/setup-hook.sh deleted file mode 100644 index 30a487ea80d..00000000000 --- a/pkgs/development/idris-modules/setup-hook.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Library import path -export IDRIS_LIBRARY_PATH=$PWD/idris-libs -mkdir -p $IDRIS_LIBRARY_PATH - -# Library install path -export IBCSUBDIR=$out/lib/@name@ -mkdir -p $IBCSUBDIR - -addIdrisLibs () { - if [ -d $1/lib/@name@ ]; then - ln -sv $1/lib/@name@/* $IDRIS_LIBRARY_PATH - fi -} - -# All run-time deps -addEnvHooks 1 addIdrisLibs |