From 046f091e0d9853a81ce4d484a75cfa1b5fc9347d Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 Aug 2017 18:22:07 -0400
Subject: treewide: Don't use envHook anymore

This commits needs a MAJOR audit as I oftentimes just guessed which of
`$hostOffset`, `$targetOffset`, or a fixed offset should be used.
---
 pkgs/development/idris-modules/build-idris-package.nix | 3 ++-
 pkgs/development/idris-modules/with-packages.nix       | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'pkgs/development/idris-modules')

diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix
index 9dfa3430ed8..66eddd0e360 100644
--- a/pkgs/development/idris-modules/build-idris-package.nix
+++ b/pkgs/development/idris-modules/build-idris-package.nix
@@ -18,7 +18,8 @@
       fi
     }
 
-    envHooks+=(addIdrisLibs)
+    # All run-time deps
+    addEnvHooks 0 addIdrisLibs
   '';
 
   buildPhase = ''
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 = ''
-- 
cgit 1.4.1


From 69d4adee1f8b6278a19708a9051f3290f8f13e04 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 20 Jan 2018 19:58:06 -0500
Subject: idris: Move library setup to the setup hook.

This was broken in preHook because addEnvHooks isn't defined yet.
---
 .../idris-modules/build-idris-package.nix          | 27 ++++------------------
 pkgs/development/idris-modules/idris-wrapper.nix   |  3 +++
 pkgs/development/idris-modules/setup-hook.sh       | 16 +++++++++++++
 3 files changed, 23 insertions(+), 23 deletions(-)
 create mode 100644 pkgs/development/idris-modules/setup-hook.sh

(limited to 'pkgs/development/idris-modules')

diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix
index 66eddd0e360..0048634f5b4 100644
--- a/pkgs/development/idris-modules/build-idris-package.nix
+++ b/pkgs/development/idris-modules/build-idris-package.nix
@@ -3,40 +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
-    }
-
-    # All run-time deps
-    addEnvHooks 0 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 32424ba1f86..c67624337bb 100644
--- a/pkgs/development/idris-modules/idris-wrapper.nix
+++ b/pkgs/development/idris-modules/idris-wrapper.nix
@@ -9,6 +9,9 @@ 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
-- 
cgit 1.4.1