mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-18 02:05:51 +03:00
Merge pull request #199288 from NickCao/lua-ossl
lua-modules: unpin to openssl_1_1
This commit is contained in:
commit
73a6462da2
@ -27,7 +27,7 @@
|
||||
, mariadb
|
||||
, mpfr
|
||||
, neovim-unwrapped
|
||||
, openssl_1_1
|
||||
, openssl
|
||||
, pcre
|
||||
, pkg-config
|
||||
, postgresql
|
||||
@ -73,8 +73,8 @@ with prev;
|
||||
|
||||
cqueues = (prev.luaLib.overrideLuarocks prev.cqueues (drv: {
|
||||
externalDeps = [
|
||||
{ name = "CRYPTO"; dep = openssl_1_1; }
|
||||
{ name = "OPENSSL"; dep = openssl_1_1; }
|
||||
{ name = "CRYPTO"; dep = openssl; }
|
||||
{ name = "OPENSSL"; dep = openssl; }
|
||||
];
|
||||
disabled = luaOlder "5.1" || luaAtLeast "5.4";
|
||||
})).overrideAttrs (oa: rec {
|
||||
@ -331,9 +331,8 @@ with prev;
|
||||
|
||||
luaossl = prev.luaLib.overrideLuarocks prev.luaossl (drv: {
|
||||
externalDeps = [
|
||||
# https://github.com/wahern/luaossl/pull/199
|
||||
{ name = "CRYPTO"; dep = openssl_1_1; }
|
||||
{ name = "OPENSSL"; dep = openssl_1_1; }
|
||||
{ name = "CRYPTO"; dep = openssl; }
|
||||
{ name = "OPENSSL"; dep = openssl; }
|
||||
];
|
||||
});
|
||||
|
||||
@ -345,7 +344,7 @@ with prev;
|
||||
|
||||
luasec = prev.luaLib.overrideLuarocks prev.luasec (drv: {
|
||||
externalDeps = [
|
||||
{ name = "OPENSSL"; dep = openssl_1_1; }
|
||||
{ name = "OPENSSL"; dep = openssl; }
|
||||
];
|
||||
});
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user