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

Revert "Fix #26441: avoid infinite recursion"

Browse Source 
This reverts commit 9cad7076d1.

See https://github.com/NixOS/nixpkgs/commit/9cad7076d1bc5475a857fd2c6e9a56d9ed254252#commitcomment-22548331
This commit is contained in:
Domen Kožar
2017-06-15 10:19:29 +02:00
parent fe041692e2
commit 7c455b5b7e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/haskell-modules/generic-stack-builder.nix
+2 -2
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;