diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix index 0048634f5b45..66eddd0e3602 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 155098a46252..fcd02c4da246 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 30a487ea80d4..000000000000 --- 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