lua-packages: fix eval failure when cross-compiling
remove the inherit line did not work fixes mpv for example nix-repl> pkgsCross.aarch64-multiplatform.lua.withPackages (ps: with ps; [ luasocket ]) error: attribute 'runtimeShell' missing at /home/artturin/nixgits/my-nixpkgs/pkgs/top-level/all-packages.nix:849:17: 848| substitutions = { 849| shell = targetPackages.runtimeShell; | ^ 850| passthru.tests = tests.makeWrapper; … while evaluating the attribute 'shell' of the derivation 'hook' at /home/artturin/nixgits/my-nixpkgs/pkgs/stdenv/generic/make-derivation.nix:270:7: 269| // (lib.optionalAttrs (attrs ? name || (attrs ? pname && attrs ? version)) { 270| name = | ^ 271| let … while evaluating 'optionalString' at /home/artturin/nixgits/my-nixpkgs/lib/strings.nix:203:5: 202| # String to return if condition is true 203| string: if cond then string else ""; | ^ 204| … from call site at /home/artturin/nixgits/my-nixpkgs/pkgs/build-support/trivial-builders.nix:536:12: 535| cp ${script} $out/nix-support/setup-hook 536| '' + lib.optionalString (deps != []) '' | ^ 537| printWords ${toString deps} > $out/nix-support/propagated-build-inputs … while evaluating the attribute 'buildCommand' of the derivation 'hook' at /home/artturin/nixgits/my-nixpkgs/pkgs/stdenv/generic/make-derivation.nix:270:7: 269| // (lib.optionalAttrs (attrs ? name || (attrs ? pname && attrs ? version)) { 270| name = | ^ 271| let … while evaluating anonymous lambda at /home/artturin/nixgits/my-nixpkgs/lib/lists.nix:646:25: 645| */ 646| unique = foldl' (acc: e: if elem e acc then acc else acc ++ [ e ]) []; | ^ 647| … from call site at /home/artturin/nixgits/my-nixpkgs/pkgs/development/interpreters/lua-5/build-lua-package.nix:105:27: 104| # example externalDeps': [ { name = "CRYPTO"; dep = pkgs.openssl; } ] 105| externalDepsGenerated = lib.unique (lib.filter (drv: !drv ? luaModule) ( | ^ 106| luarocksDrv.nativeBuildInputs ++ luarocksDrv.propagatedBuildInputs ++ luarocksDrv.buildInputs) … while evaluating 'generateLuarocksConfig' at /home/artturin/nixgits/my-nixpkgs/pkgs/development/lua-modules/lib.nix:83:28: 82| */ 83| generateLuarocksConfig = { | ^ 84| externalDeps … from call site at /home/artturin/nixgits/my-nixpkgs/pkgs/development/interpreters/lua-5/build-lua-package.nix:85:23: 84| luarocks_content = let 85| generatedConfig = lua.pkgs.lib.generateLuarocksConfig { | ^ 86| externalDeps = externalDeps ++ externalDepsGenerated; … while evaluating the attribute 'configurePhase' of the derivation 'lua5.2-luasocket-3.0.0-1-aarch64-unknown-linux-gnu' at /home/artturin/nixgits/my-nixpkgs/pkgs/stdenv/generic/make-derivation.nix:270:7: 269| // (lib.optionalAttrs (attrs ? name || (attrs ? pname && attrs ? version)) { 270| name = | ^ 271| let … while evaluating anonymous lambda at /home/artturin/nixgits/my-nixpkgs/lib/lists.nix:646:25: 645| */ 646| unique = foldl' (acc: e: if elem e acc then acc else acc ++ [ e ]) []; | ^ 647| … from call site at /home/artturin/nixgits/my-nixpkgs/pkgs/development/lua-modules/lib.nix:5:6: 4| modules = filter hasLuaModule drvs; 5| in unique ([lua] ++ modules ++ concatLists (catAttrs "requiredLuaModules" modules)); | ^ 6| # Check whether a derivation provides a lua module. … while evaluating 'requiredLuaModules' at /home/artturin/nixgits/my-nixpkgs/pkgs/development/lua-modules/lib.nix:3:24: 2| let 3| requiredLuaModules = drvs: with lib; let | ^ 4| modules = filter hasLuaModule drvs; … from call site at /home/artturin/nixgits/my-nixpkgs/pkgs/development/interpreters/lua-5/wrapper.nix:13:14: 12| env = let 13| paths = requiredLuaModules (extraLibs ++ [ lua ] ); | ^ 14| in buildEnv { … while evaluating the attribute 'passAsFile' at /home/artturin/nixgits/my-nixpkgs/pkgs/build-support/buildenv/default.nix:77:5: 76| # XXX: The size is somewhat arbitrary 77| passAsFile = if builtins.stringLength pkgs >= 128*1024 then [ "pkgs" ] else [ ]; | ^ 78| } … while evaluating the attribute 'passAsFile' of the derivation 'lua-aarch64-unknown-linux-gnu-5.2.4-env' at /home/artturin/nixgits/my-nixpkgs/pkgs/stdenv/generic/make-derivation.nix:270:7: 269| // (lib.optionalAttrs (attrs ? name || (attrs ? pname && attrs ? version)) { 270| name = | ^ 271| let
This commit is contained in:
parent
ada17132ec
commit
4a25775546
|
@ -60,7 +60,7 @@ in
|
|||
# wraps programs in $out/bin with valid LUA_PATH/LUA_CPATH
|
||||
wrapLua = callPackage ../development/interpreters/lua-5/wrap-lua.nix {
|
||||
inherit lua lib;
|
||||
inherit (pkgs) makeSetupHook makeWrapper;
|
||||
inherit (pkgs.buildPackages) makeSetupHook makeWrapper;
|
||||
};
|
||||
|
||||
luarocks = callPackage ../development/tools/misc/luarocks/default.nix {
|
||||
|
|
Loading…
Reference in a new issue