From ee44aeef707dc85489a06b2274d56e89ac0187ad Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 1 Jul 2022 17:57:17 +0800 Subject: mariadb: fix build on riscv --- pkgs/servers/sql/mariadb/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 71b638b9ab8c2..173825834dee3 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -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 { -- cgit 1.4.1 From 7f930f85a16afe2cf044c4ebacb267ef34cc23bd Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 1 Jul 2022 18:07:17 +0800 Subject: mariadb: move cross compilation related cmake flags to common section --- pkgs/servers/sql/mariadb/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 173825834dee3..6adc3649ff16f 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -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) '' -- cgit 1.4.1