From b58f6f6b515e0bd8a739df7ee49541db52ea0b6e Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sun, 9 May 2021 15:19:15 +0200 Subject: [PATCH 1/2] mariadb-galera: remove unused code --- pkgs/servers/sql/mariadb/galera/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/servers/sql/mariadb/galera/default.nix b/pkgs/servers/sql/mariadb/galera/default.nix index 165b9216240..cbee434d89b 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"; From 59eba3aa9c97a55ecf60c86cfa263d9cb38ddbda Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sun, 9 May 2021 15:41:55 +0200 Subject: [PATCH 2/2] mariadb-galera: don't produce symlink loop as sugested by Izorkin --- pkgs/servers/sql/mariadb/galera/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/sql/mariadb/galera/default.nix b/pkgs/servers/sql/mariadb/galera/default.nix index cbee434d89b..2b387db66cd 100644 --- a/pkgs/servers/sql/mariadb/galera/default.nix +++ b/pkgs/servers/sql/mariadb/galera/default.nix @@ -23,7 +23,8 @@ 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; {