b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #179790 from NickCao/mariadb-cross

Browse source 
mariadb{,-client}: fix cross compilation and build on riscv
This commit is contained in:
Janne Heß 2022-08-24 22:53:49 +02:00 committed by GitHub
parent 8db2e7bb02 7f930f85a1
commit 3852b03bbc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -94,6 +94,10 @@ commonOptions = packageSettings: rec { # attributes common to both builds
# to pass in java explicitly.
"-DCONNECT_WITH_JDBC=OFF"
"-DCURSES_LIBRARY=${ncurses.out}/lib/libncurses.dylib"
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
# revisit this if nixpkgs supports any architecture whose stack grows upwards
"-DSTACK_DIRECTION=-1"
"-DCMAKE_CROSSCOMPILING_EMULATOR=${stdenv.hostPlatform.emulator buildPackages}"
];
postInstall = ''
@ -211,10 +215,6 @@ in stdenv.mkDerivation (common // {
"-DPLUGIN_AUTH_PAM_V1=NO"
"-DWITHOUT_OQGRAPH=1"
"-DWITHOUT_PLUGIN_S3=1"
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
# revisit this if nixpkgs supports any architecture whose stack grows upwards
"-DSTACK_DIRECTION=-1"
"-DCMAKE_CROSSCOMPILING_EMULATOR=${stdenv.hostPlatform.emulator buildPackages}"
];
preConfigure = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
@ -234,6 +234,7 @@ in stdenv.mkDerivation (common // {
'';
CXXFLAGS = lib.optionalString stdenv.hostPlatform.isi686 "-fpermissive";
NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic";
});
in {
mariadb_104 = mariadbPackage {