Merge branch 'master' into fix-idris-modules

4 files changed, 25 insertions, 25 deletions

diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix
index 9dfa3430ed8..0048634f5b4 100644
--- a/pkgs/development/idris-modules/build-idris-package.nix
+++ b/pkgs/development/idris-modules/build-idris-package.nix
@@ -3,39 +3,21 @@
 # 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
-    }
-
-    envHooks+=(addIdrisLibs)
-  '';
-
   buildPhase = ''
-    ${idris}/bin/idris --build *.ipkg
+    idris --build *.ipkg
   '';
 
   doCheck = true;
 
   checkPhase = ''
     if grep -q test *.ipkg; then
-      ${idris}/bin/idris --testpkg *.ipkg
+      idris --testpkg *.ipkg
     fi
   '';
 
   installPhase = ''
-    ${idris}/bin/idris --install *.ipkg --ibcsubdir $IBCSUBDIR
+    idris --install *.ipkg --ibcsubdir $IBCSUBDIR
   '';
 
-  buildInputs = [ gmp ];
+  buildInputs = [ gmp idris ];
 } // args)
diff --git a/pkgs/development/idris-modules/idris-wrapper.nix b/pkgs/development/idris-modules/idris-wrapper.nix
index 5e3eb511bd3..0e3a8393140 100644
--- a/pkgs/development/idris-modules/idris-wrapper.nix
+++ b/pkgs/development/idris-modules/idris-wrapper.nix
@@ -10,5 +10,7 @@ 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
new file mode 100644
index 00000000000..30a487ea80d
--- /dev/null
+++ b/pkgs/development/idris-modules/setup-hook.sh
@@ -0,0 +1,16 @@
+# 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
diff --git a/pkgs/development/idris-modules/with-packages.nix b/pkgs/development/idris-modules/with-packages.nix
index d2b09808ec1..d4638670f69 100644
--- a/pkgs/development/idris-modules/with-packages.nix
+++ b/pkgs/development/idris-modules/with-packages.nix
@@ -14,7 +14,7 @@
       fi
     }
 
-    envHooks+=(installIdrisLib)
+    envHostTargetHooks+=(installIdrisLib)
   '';
 
   unpackPhase = ''