commit 236cf1200e7870aa589405d2c8437de74437e565 · pyrox.dev/nixpkgs

+16 -20

pkgs/development/lua-modules/generic/default.nix

···

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
        
       {

     

       8
       8
       -
         disabled ? false,

     

       9
       8
        
         propagatedBuildInputs ? [ ],

     

       10
       9
        
         makeFlags ? [ ],

     

       11
       10
        
         ...

     

       12
       11
        
       }@attrs:

     

       13
       12
        
       

     

       14
       14
       -
       if disabled then

     

       15
       15
       -
         throw "${attrs.name} not supported by interpreter lua-${lua.luaversion}"

     

       16
       16
       -
       else

     

       17
       17
       -
         toLuaModule (

     

       18
       18
       -
           lua.stdenv.mkDerivation (

     

       19
       19
       -
             attrs

     

       20
       20
       -
             // {

     

       21
       21
       -
               name = "lua${lua.luaversion}-" + attrs.pname + "-" + attrs.version;

     

       13
       13
       +
       toLuaModule (

     

       14
       14
       +
         lua.stdenv.mkDerivation (

     

       15
       15
       +
           attrs

     

       16
       16
       +
           // {

     

       17
       17
       +
             name = "lua${lua.luaversion}-" + attrs.pname + "-" + attrs.version;

     

       22
       18
        
       

     

       23
       23
       -
               makeFlags = [

     

       24
       24
       -
                 "PREFIX=$(out)"

     

       25
       25
       -
                 "LUA_INC=-I${lua}/include"

     

       26
       26
       -
                 "LUA_LIBDIR=$(out)/lib/lua/${lua.luaversion}"

     

       27
       27
       -
                 "LUA_VERSION=${lua.luaversion}"

     

       28
       28
       -
               ] ++ makeFlags;

     

       19
       19
       +
             makeFlags = [

     

       20
       20
       +
               "PREFIX=$(out)"

     

       21
       21
       +
               "LUA_INC=-I${lua}/include"

     

       22
       22
       +
               "LUA_LIBDIR=$(out)/lib/lua/${lua.luaversion}"

     

       23
       23
       +
               "LUA_VERSION=${lua.luaversion}"

     

       24
       24
       +
             ] ++ makeFlags;

     

       29
       25
        
       

     

       30
       30
       -
               propagatedBuildInputs = propagatedBuildInputs ++ [

     

       31
       31
       -
                 lua # propagate it for its setup-hook

     

       32
       32
       -
               ];

     

       33
       33
       -
             }

     

       34
       34
       -
           )

     

       26
       26
       +
             propagatedBuildInputs = propagatedBuildInputs ++ [

     

       27
       27
       +
               lua # propagate it for its setup-hook

     

       28
       28
       +
             ];

     

       29
       29
       +
           }

     

       35
       30
        
         )

     

       31
       31
       +
       )

+2 -5

pkgs/top-level/lua-packages.nix

···

       121
       121
        
           buildLuaPackage rec {

     

       122
       122
        
             pname = "lua-pam";

     

       123
       123
        
             version = "unstable-2015-07-03";

     

       124
       124
       -
             # Needed for `disabled`, overridden in buildLuaPackage

     

       125
       125
       -
             name = "${pname}-${version}";

     

       126
       124
        
       

     

       127
       125
        
             src = fetchFromGitHub {

     

       128
       126
        
               owner = "devurandom";

     
···

       147
       145
        
               runHook postInstall

     

       148
       146
        
             '';

     

       149
       147
        
       

     

       150
       150
       -
             # The package does not build with lua 5.4 or luaJIT

     

       151
       151
       -
             disabled = luaAtLeast "5.4" || isLuaJIT;

     

       152
       152
       -
       

     

       153
       148
        
             meta = with lib; {

     

       149
       149
       +
               # The package does not build with lua 5.4 or luaJIT

     

       150
       150
       +
               broken = luaAtLeast "5.4" || isLuaJIT;

     

       154
       151
        
               description = "Lua module for PAM authentication";

     

       155
       152
        
               homepage = "https://github.com/devurandom/lua-pam";

     

       156
       153
        
               license = licenses.mit;