From cbacc46e4570afaa1f9d6ca99bb3d6134d6b8c26 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 26 Oct 2013 18:17:04 +0200 Subject: [PATCH] haskell-hslua: remove support for linking the system's lua library This feature is broken: . --- pkgs/development/libraries/haskell/hslua/default.nix | 4 +--- pkgs/top-level/haskell-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/hslua/default.nix b/pkgs/development/libraries/haskell/hslua/default.nix index ebccbf963fe..11740095284 100644 --- a/pkgs/development/libraries/haskell/hslua/default.nix +++ b/pkgs/development/libraries/haskell/hslua/default.nix @@ -1,12 +1,10 @@ -{ cabal, lua, mtl }: +{ cabal, mtl }: cabal.mkDerivation (self: { pname = "hslua"; version = "0.3.7"; sha256 = "1q5s2b7x9idvdvp31yl86mmy476gfq6rg8f0r8faqxrm45jwgv2q"; buildDepends = [ mtl ]; - pkgconfigDepends = [ lua ]; - configureFlags = "-fsystem-lua"; meta = { description = "A Lua language interpreter embedding in Haskell"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 5b2a0a66173..a7c5a8565a1 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1261,9 +1261,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x hsemail = callPackage ../development/libraries/haskell/hsemail {}; - hslua = callPackage ../development/libraries/haskell/hslua { - lua = pkgs.lua5_1; - }; + hslua = callPackage ../development/libraries/haskell/hslua {}; HSH = callPackage ../development/libraries/haskell/HSH {};