Commit a9737f61 authored by Peter Simons's avatar Peter Simons Committed by GitHub
Browse files

Merge pull request #25398 from ljli/ghci-sys-libs 

haskell: set LD_LIBRARY_PATH in shellHook
parents 4ea520ce e73e5c88

pkgs/development/haskell-modules/generic-builder.nix

+5 −1
Original line number Diff line number Diff line
@@ -63,7 +63,8 @@ assert enableSplitObjs == null; 
let



  inherit (stdenv.lib) optional optionals optionalString versionOlder versionAtLeast

                       concatStringsSep enableFeature optionalAttrs toUpper;

                       concatStringsSep enableFeature optionalAttrs toUpper

                       filter makeLibraryPath;



  isGhcjs = ghc.isGhcjs or false;

  isHaLVM = ghc.isHaLVM or false;
@@ -330,6 +331,9 @@ stdenv.mkDerivation ({ 
        export NIX_${ghcCommandCaps}="${ghcEnv}/bin/${ghcCommand}"

        export NIX_${ghcCommandCaps}PKG="${ghcEnv}/bin/${ghcCommand}-pkg"

        export NIX_${ghcCommandCaps}_DOCDIR="${ghcEnv}/share/doc/ghc/html"

        export LD_LIBRARY_PATH="''${LD_LIBRARY_PATH:+''${LD_LIBRARY_PATH}:}${

          makeLibraryPath (filter (x: !isNull x) systemBuildInputs)

        }"

        ${if isHaLVM

            then ''export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/HaLVM-${ghc.version}"''

            else ''export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/${ghcCommand}-${ghc.version}"''}