From 13e95f33db894f7d7a46f1ffe054fe56ba83b030 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 11 Mar 2018 16:59:29 +0100 Subject: [PATCH] lumail: Use lua5.1 This is necessary because the standard library which is distributed with lumail (the lumail core configuration so to speak) is written for lua5.1 apparently. The website states 5.1 or 5.2 or 5.3, but 5.2 fails because "loadstring" was deprecated in lua 5.2. Signed-off-by: Matthias Beyer --- pkgs/applications/networking/mailreaders/lumail/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/lumail/default.nix b/pkgs/applications/networking/mailreaders/lumail/default.nix index 5a333c8d982..79deab46912 100644 --- a/pkgs/applications/networking/mailreaders/lumail/default.nix +++ b/pkgs/applications/networking/mailreaders/lumail/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, lua5_2, file, ncurses, gmime, pcre-cpp -, perl, perlPackages +{ stdenv, fetchurl, pkgconfig, lua, file, ncurses, gmime, pcre-cpp +, perl, perlPackages, makeWrapper , debugBuild ? false , alternativeGlobalConfigFilePath ? null }: @@ -36,7 +36,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ - lua5_2 file ncurses gmime pcre-cpp + lua file ncurses gmime pcre-cpp perl perlPackages.JSON perlPackages.NetIMAPClient ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b3d29ce57e..3bca52f729c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16440,7 +16440,9 @@ with pkgs; looking-glass-client = callPackage ../applications/virtualization/looking-glass-client { }; - lumail = callPackage ../applications/networking/mailreaders/lumail { }; + lumail = callPackage ../applications/networking/mailreaders/lumail { + lua = lua5_1; + }; lv2bm = callPackage ../applications/audio/lv2bm { };