git.iko.soy/typeable/nixpkgs
on master help sign in
mariadb-galera: 26.4.7 -> 26.4.8

- switch from scons to cmake, because scons was deprecated upstream and this allows us to simplify the derivation significantly - add myself as maintainer

commit878c4135cdb6149c21fd7f9d95beb106a475f61a authorajs124 <git@ajs124.de> dateSat 8 May 2021, 02:31 (6 years ago) parent8b30f2e
1 file changed+11−28
pkgs/servers/sql/mariadb/galera/default.nix+11−28
pkgs/servers/sql/mariadb/galera/default.nix+11−28
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchFromGitHub, buildEnv
2−, asio, boost, check, openssl, scons
2+, asio, boost, check, openssl, cmake
33}:
44
55let
@@ -10,50 +10,33 @@ let
1010
1111in stdenv.mkDerivation rec {
1212 pname = "mariadb-galera";
13− version = "26.4.7";
13+ version = "26.4.8";
1414
1515 src = fetchFromGitHub {
1616 owner = "codership";
1717 repo = "galera";
1818 rev = "release_${version}";
19− sha256 = "0h7s670pcasq8wzprhyxqfca2cghi62b8xz2kikb2a86wd453qil";
19+ sha256 = "0rx710dfijiykpi41rhxx8vafk07bffv2nbl3d4ggc32rzv88369";
2020 fetchSubmodules = true;
2121 };
2222
23− buildInputs = [ asio boost check openssl scons ];
24−
25− postPatch = ''
26− substituteInPlace SConstruct \
27− --replace "boost_library_path = '''" "boost_library_path = '${boost}/lib'"
28− '';
23+ buildInputs = [ asio boost check openssl cmake ];
2924
3025 preConfigure = ''
31− export CPPFLAGS="-I${asio}/include -I${boost.dev}/include -I${check}/include -I${openssl.dev}/include"
32− export LIBPATH="${galeraLibs}/lib"
26+ # make sure bundled asio cannot be used, but leave behind license, because it gets installed
27+ rm -r asio/{asio,asio.hpp}
3328 '';
3429
35− sconsFlags = "ssl=1 system_asio=1 strict_build_flags=0";
36−
37− enableParallelBuilding = true;
38−
39− installPhase = ''
40− # copied with modifications from scripts/packages/freebsd.sh
41− GALERA_LICENSE_DIR="$share/licenses/${pname}-${version}"
42− install -d $out/{bin,lib/galera,share/doc/galera,$GALERA_LICENSE_DIR}
43− install -m 555 "garb/garbd" "$out/bin/garbd"
44− install -m 444 "libgalera_smm.so" "$out/lib/galera/libgalera_smm.so"
45− install -m 444 "scripts/packages/README" "$out/share/doc/galera/"
46− install -m 444 "scripts/packages/README-MySQL" "$out/share/doc/galera/"
47− install -m 444 "scripts/packages/freebsd/LICENSE" "$out/$GALERA_LICENSE_DIR"
48− install -m 444 "LICENSE" "$out/$GALERA_LICENSE_DIR/GPLv2"
49− install -m 444 "asio/LICENSE_1_0.txt" "$out/$GALERA_LICENSE_DIR/LICENSE.asio"
30+ postInstall = ''
31+ # for backwards compatibility
32+ ln -s . $out/lib/galera
5033 '';
5134
5235 meta = with lib; {
5336 description = "Galera 3 wsrep provider library";
5437 homepage = "https://galeracluster.com/";
55− license = licenses.lgpl2;
56− maintainers = with maintainers; [ izorkin ];
38+ license = licenses.lgpl2Only;
39+ maintainers = with maintainers; [ ajs124 izorkin ];
5740 platforms = platforms.all;
5841 };
5942}