diff options
| author | Domen Kožar <domen@dev.si> | 2017-06-15 10:19:29 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2017-06-15 10:19:29 +0200 |
| commit | 7c455b5b7e31fd53a27d029435cb4a04dc64cb97 (patch) | |
| tree | 88dccfa7006a6c3eb947bc4b06ffcc3b96500c7b /pkgs/development/haskell-modules/generic-stack-builder.nix | |
| parent | fe041692e2b871ac52be6dd3ac98abf3cb99a0e0 (diff) | |
| download | nixpkgs-7c455b5b7e31fd53a27d029435cb4a04dc64cb97.tar nixpkgs-7c455b5b7e31fd53a27d029435cb4a04dc64cb97.tar.gz nixpkgs-7c455b5b7e31fd53a27d029435cb4a04dc64cb97.tar.bz2 nixpkgs-7c455b5b7e31fd53a27d029435cb4a04dc64cb97.tar.lz nixpkgs-7c455b5b7e31fd53a27d029435cb4a04dc64cb97.tar.xz nixpkgs-7c455b5b7e31fd53a27d029435cb4a04dc64cb97.tar.zst nixpkgs-7c455b5b7e31fd53a27d029435cb4a04dc64cb97.zip | |
Revert "Fix #26441: avoid infinite recursion"
This reverts commit 9cad7076d1bc5475a857fd2c6e9a56d9ed254252. See https://github.com/NixOS/nixpkgs/commit/9cad7076d1bc5475a857fd2c6e9a56d9ed254252#commitcomment-22548331
Diffstat (limited to 'pkgs/development/haskell-modules/generic-stack-builder.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/generic-stack-builder.nix | 4 |
1 files 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 fbc586bd74c..53772b90dfb 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; |