lol

Merge pull request #179790 from NickCao/mariadb-cross

mariadb{,-client}: fix cross compilation and build on riscv

authored by

Janne Heß and committed by
GitHub
3852b03b 8db2e7bb

+5 -4
+5 -4
pkgs/servers/sql/mariadb/default.nix
··· 94 94 # to pass in java explicitly. 95 95 "-DCONNECT_WITH_JDBC=OFF" 96 96 "-DCURSES_LIBRARY=${ncurses.out}/lib/libncurses.dylib" 97 + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ 98 + # revisit this if nixpkgs supports any architecture whose stack grows upwards 99 + "-DSTACK_DIRECTION=-1" 100 + "-DCMAKE_CROSSCOMPILING_EMULATOR=${stdenv.hostPlatform.emulator buildPackages}" 97 101 ]; 98 102 99 103 postInstall = '' ··· 211 215 "-DPLUGIN_AUTH_PAM_V1=NO" 212 216 "-DWITHOUT_OQGRAPH=1" 213 217 "-DWITHOUT_PLUGIN_S3=1" 214 - ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ 215 - # revisit this if nixpkgs supports any architecture whose stack grows upwards 216 - "-DSTACK_DIRECTION=-1" 217 - "-DCMAKE_CROSSCOMPILING_EMULATOR=${stdenv.hostPlatform.emulator buildPackages}" 218 218 ]; 219 219 220 220 preConfigure = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' ··· 234 234 ''; 235 235 236 236 CXXFLAGS = lib.optionalString stdenv.hostPlatform.isi686 "-fpermissive"; 237 + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic"; 237 238 }); 238 239 in { 239 240 mariadb_104 = mariadbPackage {