Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bfa497bc2b85
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: beef4b95a966
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 3, 2021

  1. buildLuaPackage: pass propagatedBuildInputs to final derivation (#108311 

    )

propagatedBuildInputs was completely overridden in the process
    @lblasc
    lblasc authored Jan 3, 2021
    Copy the full SHA
    beef4b9 View commit details
Showing with 7 additions and 4 deletions.
  1. +7 −4 pkgs/development/lua-modules/generic/default.nix
11 changes: 7 additions & 4 deletions pkgs/development/lua-modules/generic/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
{ lua, writeText, toLuaModule }:

{ disabled ? false, ... } @ attrs:
{ disabled ? false
, propagatedBuildInputs ? [ ]
, ...
} @ attrs:

if disabled then
throw "${attrs.name} not supported by interpreter lua-${lua.luaversion}"
else
toLuaModule( lua.stdenv.mkDerivation (
toLuaModule (lua.stdenv.mkDerivation (
{
makeFlags = [
"PREFIX=$(out)"
@@ -18,8 +21,8 @@ else
//
{
name = "lua${lua.luaversion}-" + attrs.name;
propagatedBuildInputs = [
propagatedBuildInputs = propagatedBuildInputs ++ [
lua # propagate it for its setup-hook
];
}
) )
))