From 959e79f4c766be8a072c90cb20b98121e7a85f48 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 22 Aug 2013 10:32:42 +0200 Subject: [PATCH] haskell-packages.nix: fix builds of 'terminfo' and 'readline' These builds depend on the ncurses library, but that package was shadowed when the 'ncurses' Haskell library was added. --- pkgs/top-level/haskell-packages.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 61b4d6c50b3..4c7fb8602a5 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1473,7 +1473,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); naturals = callPackage ../development/libraries/haskell/naturals {}; - ncurses = callPackage ../development/libraries/haskell/ncurses { inherit (pkgs) ncurses; }; + ncurses = callPackage ../development/libraries/haskell/ncurses { + inherit (pkgs) ncurses; + }; netlist = callPackage ../development/libraries/haskell/netlist {}; @@ -1697,7 +1699,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ReadArgs = callPackage ../development/libraries/haskell/ReadArgs {}; readline = callPackage ../development/libraries/haskell/readline { - inherit (pkgs) readline; + inherit (pkgs) readline ncurses; }; recaptcha = callPackage ../development/libraries/haskell/recaptcha {}; @@ -1927,7 +1929,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); terminalProgressBar = callPackage ../development/libraries/haskell/terminal-progress-bar {}; - terminfo = callPackage ../development/libraries/haskell/terminfo {}; + terminfo = callPackage ../development/libraries/haskell/terminfo { + inherit (pkgs) ncurses; + }; testFramework = callPackage ../development/libraries/haskell/test-framework {};