diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-05-10 12:24:32 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-10 12:24:32 +0000 |
commit | 115881e756360e1815f1d18a78697d28a319efac (patch) | |
tree | 4ed926ed60df9d605ca4abcc9e4ad4037eac2fed /pkgs/servers/sql | |
parent | f4d69ad1f211b18f93d3b39d20d9d3c5a5b5fb71 (diff) | |
parent | acd5e6707e93c6b0928c96bc43057e91fa0bcee0 (diff) | |
download | nixpkgs-115881e756360e1815f1d18a78697d28a319efac.tar nixpkgs-115881e756360e1815f1d18a78697d28a319efac.tar.gz nixpkgs-115881e756360e1815f1d18a78697d28a319efac.tar.bz2 nixpkgs-115881e756360e1815f1d18a78697d28a319efac.tar.lz nixpkgs-115881e756360e1815f1d18a78697d28a319efac.tar.xz nixpkgs-115881e756360e1815f1d18a78697d28a319efac.tar.zst nixpkgs-115881e756360e1815f1d18a78697d28a319efac.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers/sql')
-rw-r--r-- | pkgs/servers/sql/mariadb/galera/default.nix | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/servers/sql/mariadb/galera/default.nix b/pkgs/servers/sql/mariadb/galera/default.nix index 165b9216240..2b387db66cd 100644 --- a/pkgs/servers/sql/mariadb/galera/default.nix +++ b/pkgs/servers/sql/mariadb/galera/default.nix @@ -2,13 +2,7 @@ , asio, boost, check, openssl, cmake }: -let - galeraLibs = buildEnv { - name = "galera-lib-inputs-united"; - paths = [ openssl.out boost check ]; - }; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "mariadb-galera"; version = "26.4.8"; @@ -29,7 +23,8 @@ in stdenv.mkDerivation rec { postInstall = '' # for backwards compatibility - ln -s . $out/lib/galera + mkdir $out/lib/galera + ln -s $out/lib/libgalera_smm.so $out/lib/galera/libgalera_smm.so ''; meta = with lib; { |