From 90d67c3e4fcb98df1f50ee378a5a5ed913e55f44 Mon Sep 17 00:00:00 2001
From: Mathew Polzin <matt.polzin@gmail.com>
Date: Wed, 11 Sep 2024 23:10:51 -0500
Subject: [PATCH] idris2Packages.buildIdris: QoL improvements

- use binary wrapper
- put environment variable into env attribute
- support adding attributes to passthru
---
 pkgs/development/compilers/idris2/build-idris.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/idris2/build-idris.nix b/pkgs/development/compilers/idris2/build-idris.nix
index 1efe6088f6d1..bc3e0f551705 100644
--- a/pkgs/development/compilers/idris2/build-idris.nix
+++ b/pkgs/development/compilers/idris2/build-idris.nix
@@ -2,7 +2,7 @@
   stdenv,
   lib,
   idris2,
-  makeWrapper,
+  makeBinaryWrapper,
 }:
 # Usage: let
 #          pkg = idris2Packages.buildIdris {
@@ -61,11 +61,11 @@ let
       src = src;
       nativeBuildInputs = [
         idris2
-        makeWrapper
+        makeBinaryWrapper
       ] ++ attrs.nativeBuildInputs or [ ];
       buildInputs = propagatedIdrisLibraries ++ attrs.buildInputs or [ ];
 
-      IDRIS2_PACKAGE_PATH = libDirs;
+      env.IDRIS2_PACKAGE_PATH = libDirs;
 
       buildPhase = ''
         runHook preBuild
@@ -75,10 +75,10 @@ let
 
       passthru = {
         inherit propagatedIdrisLibraries;
-      };
+      } // (attrs.passthru or { });
 
       shellHook = ''
-        export IDRIS2_PACKAGE_PATH="${finalAttrs.IDRIS2_PACKAGE_PATH}"
+        export IDRIS2_PACKAGE_PATH="${finalAttrs.env.IDRIS2_PACKAGE_PATH}"
       '';
     }
   );