summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthieu Coudron <mcoudron@hotmail.com>2023-04-24 23:07:03 +0200
committerMatthieu Coudron <teto@users.noreply.github.com>2023-04-27 22:22:01 +0200
commit26dd4a84edb018d06936ebbe48b6af029138e796 (patch)
tree05593b3872518f867431ea760957bb19f0848919
parent3d409345416cda845407e3075f5eaf7a590d9db5 (diff)
downloadnixpkgs-26dd4a84edb018d06936ebbe48b6af029138e796.tar
nixpkgs-26dd4a84edb018d06936ebbe48b6af029138e796.tar.gz
nixpkgs-26dd4a84edb018d06936ebbe48b6af029138e796.tar.bz2
nixpkgs-26dd4a84edb018d06936ebbe48b6af029138e796.tar.lz
nixpkgs-26dd4a84edb018d06936ebbe48b6af029138e796.tar.xz
nixpkgs-26dd4a84edb018d06936ebbe48b6af029138e796.tar.zst
nixpkgs-26dd4a84edb018d06936ebbe48b6af029138e796.zip
buildLuarocksPackage: fixes attributes being ignored
follow up of https://github.com/NixOS/nixpkgs/pull/224553 where
some arguments got ignored whil they were before taken into account.
-rw-r--r--pkgs/development/interpreters/lua-5/build-lua-package.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix
index adba03873aa..eeca9b11ad0 100644
--- a/pkgs/development/interpreters/lua-5/build-lua-package.nix
+++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix
@@ -83,11 +83,10 @@ let
   __structuredAttrs = true;
   env = {
     LUAROCKS_CONFIG="$PWD/${luarocks_config}";
-  };
+  } // attrs.env or {};
 
   generatedRockspecFilename = "${rockspecDir}/${pname}-${rockspecVersion}.rockspec";
 
-
   nativeBuildInputs = [
     wrapLua
     lua.pkgs.luarocks
@@ -99,6 +98,7 @@ let
     # example externalDeps': [ { name = "CRYPTO"; dep = pkgs.openssl; } ]
     externalDeps' = lib.filter (dep: !lib.isDerivation dep) self.externalDeps;
     in [ lua.pkgs.luarocks ]
+      ++ buildInputs
       ++ lib.optionals self.doCheck ([ luarocksCheckHook ] ++ self.nativeCheckInputs)
       ++ (map (d: d.dep) externalDeps')
     ;
@@ -200,15 +200,15 @@ let
   '';
 
   passthru = {
-    inherit lua; # The lua interpreter
-  };
+    inherit lua;
+  } // attrs.passthru or { };
 
   meta = {
     platforms = lua.meta.platforms;
     # add extra maintainer(s) to every package
     maintainers = (attrs.meta.maintainers or []) ++ [ ];
     broken = disabled;
-  } // attrs.meta;
+  } // attrs.meta or {};
 }));
 in
   luarocksDrv