From 7c455b5b7e31fd53a27d029435cb4a04dc64cb97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 15 Jun 2017 10:19:29 +0200
Subject: [PATCH] Revert "Fix #26441: avoid infinite recursion"
This reverts commit 9cad7076d1bc5475a857fd2c6e9a56d9ed254252.
See https://github.com/NixOS/nixpkgs/commit/9cad7076d1bc5475a857fd2c6e9a56d9ed254252#commitcomment-22548331
---
pkgs/development/haskell-modules/generic-stack-builder.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix
index fbc586bd74c7..53772b90dfb7 100644
--- a/pkgs/development/haskell-modules/generic-stack-builder.nix
+++ b/pkgs/development/haskell-modules/generic-stack-builder.nix
@@ -5,7 +5,7 @@ with stdenv.lib;
{ buildInputs ? []
, extraArgs ? []
, LD_LIBRARY_PATH ? []
-, ghc' ? ghc
+, ghc ? ghc
, ...
}@args:
@@ -14,7 +14,7 @@ stdenv.mkDerivation (args // {
buildInputs =
buildInputs ++
optional stdenv.isLinux glibcLocales ++
- [ ghc' pkgconfig ];
+ [ ghc pkgconfig ];
STACK_PLATFORM_VARIANT="nix";
STACK_IN_NIX_SHELL=1;