public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskell: set buildInputs in nix-shell env

Browse Source 
systemBuildInputs goes in buildInputs (instead of nativeBuildInputs) so that
NIX_CFLAGS_* is set correctly and gcc works.
This commit is contained in:
Thomas Tuegel 2017-12-18 13:49:18 -06:00
parent 67f9fd9e9f
commit 86311030cf
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/haskell-modules/generic-builder.nix
View File

@ -362,7 +362,8 @@ stdenv.mkDerivation ({
env = stdenv.mkDerivation { env = stdenv.mkDerivation {
name = "interactive-${pname}-${version}-environment"; name = "interactive-${pname}-${version}-environment";
nativeBuildInputs = [ ghcEnv systemBuildInputs ]; buildInputs = systemBuildInputs;
nativeBuildInputs = [ ghcEnv ];
LANG = "en_US.UTF-8"; LANG = "en_US.UTF-8";
LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive"; LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive";
shellHook = '' shellHook = ''