From 01a1cb913e007f096cbf7d962c7e3a048c5cfa18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 6 Feb 2019 16:27:27 +0100 Subject: [PATCH] luajit_*: avoid double callPackage IIRC it causes some problems when overriding. --- pkgs/top-level/all-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b61ad101db0..14ab32ac8f30 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7796,12 +7796,14 @@ in luaPackages = lua52Packages; # override instead ? - luajit_2_0 = callPackage ../development/interpreters/luajit/2.0.nix { + luajit_2_0 = import ../development/interpreters/luajit/2.0.nix { self = luajit_2_0; + inherit (super) callPackage lib; }; - luajit_2_1 = callPackage ../development/interpreters/luajit/2.1.nix { + luajit_2_1 = import ../development/interpreters/luajit/2.1.nix { self = luajit_2_1; + inherit (super) callPackage lib; }; luajit = luajit_2_1;