cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

mariadb: use openssl_1_1 for older releases

Browse source 
https://jira.mariadb.org/browse/MDEV-28339
This commit is contained in:
ajs124 2022-06-01 00:07:33 +02:00
parent 6ebaf8532e
commit 84f17a3082
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/servers/sql/mariadb/default.nix
View file

@ -2,7 +2,7 @@
# Native buildInputs components # Native buildInputs components
, bison, boost, cmake, fixDarwinDylibNames, flex, makeWrapper, pkg-config , bison, boost, cmake, fixDarwinDylibNames, flex, makeWrapper, pkg-config
# Common components # Common components
, curl, libiconv, ncurses, openssl, pcre, pcre2 , curl, libiconv, ncurses, openssl, openssl_1_1, pcre, pcre2
, libkrb5, libaio, liburing, systemd , libkrb5, libaio, liburing, systemd
, CoreServices, cctools, perl , CoreServices, cctools, perl
, jemalloc, less, libedit , jemalloc, less, libedit
@ -39,13 +39,16 @@ commonOptions = packageSettings: rec { # attributes common to both builds
++ lib.optional (!stdenv.hostPlatform.isDarwin) makeWrapper; ++ lib.optional (!stdenv.hostPlatform.isDarwin) makeWrapper;
buildInputs = [ buildInputs = [
curl libiconv ncurses openssl zlib libiconv ncurses zlib
] ++ (packageSettings.extraBuildInputs or []) ] ++ (packageSettings.extraBuildInputs or [])
++ lib.optionals stdenv.hostPlatform.isLinux ([ libkrb5 systemd ] ++ lib.optionals stdenv.hostPlatform.isLinux ([ libkrb5 systemd ]
++ (if (lib.versionOlder version "10.6") then [ libaio ] else [ liburing ])) ++ (if (lib.versionOlder version "10.6") then [ libaio ] else [ liburing ]))
++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices cctools perl libedit ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices cctools perl libedit ]
++ lib.optional (!stdenv.hostPlatform.isDarwin) [ jemalloc ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) [ jemalloc ]
++ (if (lib.versionOlder version "10.5") then [ pcre ] else [ pcre2 ]); ++ (if (lib.versionOlder version "10.5") then [ pcre ] else [ pcre2 ])
++ (if (lib.versionOlder version "10.8")
then [ openssl_1_1 (curl.override { openssl = openssl_1_1; }) ]
else [ openssl curl ]);
prePatch = '' prePatch = ''
sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt