idris: Move library setup to the setup hook.

This was broken in preHook because addEnvHooks isn't defined yet.

+23 -23
+4 -23
pkgs/development/idris-modules/build-idris-package.nix
··· 3 3 # args: Additional arguments to pass to mkDerivation. Generally should include at least 4 4 # name and src. 5 5 { stdenv, idris, gmp }: args: stdenv.mkDerivation ({ 6 - preHook = '' 7 - # Library import path 8 - export IDRIS_LIBRARY_PATH=$PWD/idris-libs 9 - mkdir -p $IDRIS_LIBRARY_PATH 10 - 11 - # Library install path 12 - export IBCSUBDIR=$out/lib/${idris.name} 13 - mkdir -p $IBCSUBDIR 14 - 15 - addIdrisLibs () { 16 - if [ -d $1/lib/${idris.name} ]; then 17 - ln -sv $1/lib/${idris.name}/* $IDRIS_LIBRARY_PATH 18 - fi 19 - } 20 - 21 - # All run-time deps 22 - addEnvHooks 0 addIdrisLibs 23 - ''; 24 - 25 6 buildPhase = '' 26 - ${idris}/bin/idris --build *.ipkg 7 + idris --build *.ipkg 27 8 ''; 28 9 29 10 doCheck = true; 30 11 31 12 checkPhase = '' 32 13 if grep -q test *.ipkg; then 33 - ${idris}/bin/idris --testpkg *.ipkg 14 + idris --testpkg *.ipkg 34 15 fi 35 16 ''; 36 17 37 18 installPhase = '' 38 - ${idris}/bin/idris --install *.ipkg --ibcsubdir $IBCSUBDIR 19 + idris --install *.ipkg --ibcsubdir $IBCSUBDIR 39 20 ''; 40 21 41 - buildInputs = [ gmp ]; 22 + buildInputs = [ gmp idris ]; 42 23 } // args)
+3
pkgs/development/idris-modules/idris-wrapper.nix
··· 9 9 wrapProgram $out/bin/idris \ 10 10 --suffix PATH : ${ stdenv.lib.makeBinPath path } \ 11 11 --suffix LIBRARY_PATH : ${stdenv.lib.makeLibraryPath lib} 12 + 13 + mkdir -p $out/nix-support 14 + substituteAll ${./setup-hook.sh} $out/nix-support/setup-hook 12 15 ''; 13 16 } 14 17
+16
pkgs/development/idris-modules/setup-hook.sh
··· 1 + # Library import path 2 + export IDRIS_LIBRARY_PATH=$PWD/idris-libs 3 + mkdir -p $IDRIS_LIBRARY_PATH 4 + 5 + # Library install path 6 + export IBCSUBDIR=$out/lib/@name@ 7 + mkdir -p $IBCSUBDIR 8 + 9 + addIdrisLibs () { 10 + if [ -d $1/lib/@name@ ]; then 11 + ln -sv $1/lib/@name@/* $IDRIS_LIBRARY_PATH 12 + fi 13 + } 14 + 15 + # All run-time deps 16 + addEnvHooks 1 addIdrisLibs