mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity

Revert "Fix #26441: avoid infinite recursion"

Browse source 
This reverts commit 9cad7076d1.

See 9cad7076d1 (commitcomment-22548331)
This commit is contained in:
Domen Kožar 2017-06-15 10:19:29 +02:00
parent fe041692e2
commit 7c455b5b7e
No known key found for this signature in database
GPG key ID: C2FFBCAFD2C24246
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/haskell-modules/generic-stack-builder.nix
View file

@ -5,7 +5,7 @@ with stdenv.lib;
{ buildInputs ? [] { buildInputs ? []
, extraArgs ? [] , extraArgs ? []
, LD_LIBRARY_PATH ? [] , LD_LIBRARY_PATH ? []
, ghc' ? ghc , ghc ? ghc
, ... , ...
}@args: }@args:
@ -14,7 +14,7 @@ stdenv.mkDerivation (args // {
buildInputs = buildInputs =
buildInputs ++ buildInputs ++
optional stdenv.isLinux glibcLocales ++ optional stdenv.isLinux glibcLocales ++
[ ghc' pkgconfig ]; [ ghc pkgconfig ];
STACK_PLATFORM_VARIANT="nix"; STACK_PLATFORM_VARIANT="nix";
STACK_IN_NIX_SHELL=1; STACK_IN_NIX_SHELL=1;