From 2594999cede5b0ceb2991d74c42a5dde2514dfbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sat, 17 Jan 2015 01:25:10 +0100 Subject: [PATCH] ihaskell: fix path to installedconf in wrapper --- pkgs/development/tools/haskell/ihaskell/wrapper.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix index 3637400b46d..281a3177bae 100644 --- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix +++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { - inherit (ihaskell) name; + inherit (ihaskell) name pname version; buildInputs = [ makeWrapper ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { --set PROFILE_DIR "\$HOME/.ipython/profile_haskell" \ --set PROFILE_TAR "$(find ${ihaskell} -iname "profile.tar")" \ --set PROFILE_INIT "\$([ ! -d \$PROFILE_DIR ] && mkdir -p \$PROFILE_DIR && tar xvf \$PROFILE_TAR -C \$PROFILE_DIR)" \ - --prefix GHC_PACKAGE_PATH : "\$(${ghc.GHCGetPackages} ${ghc.version}|sed -e 's, -package-db ,:,g'|cut -b 2-):${ihaskell}/lib/ghc-${ghc.version}/package.conf.d/${name}.installedconf" \ + --prefix GHC_PACKAGE_PATH : "\$(${ghc.GHCGetPackages} ${ghc.version}|sed -e 's, -package-db ,:,g'|cut -b 2-):${ihaskell}/lib/ghc-${ghc.version}/package.conf.d/${pname}-${version}.installedconf" \ --set GHC_PACKAGE_PATH "\$GHC_PACKAGE_PATH:" # always end with : to include base packages '';