New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
mariadb: 10.5.8 -> 10.5.10 #122132
Merged
Merged
mariadb: 10.5.8 -> 10.5.10 #122132
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- switch from scons to cmake, because scons was deprecated upstream and this allows us to simplify the derivation significantly - add myself as maintainer
Maybe this should be put into two PRs |
ofborg
bot
added
10.rebuild-darwin: 1-10
10.rebuild-linux: 101-500
10.rebuild-darwin: 11-100
and removed
10.rebuild-darwin: 1-10
labels
May 8, 2021
dasJ
approved these changes
May 9, 2021
@ajs124 check this small fix: 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; {
|
Removing the let is definitely fine, but what's the upside to linking the library instead of just linking the folder? |
10 tasks
Yes, needed remove symlink loop.
after patch:
|
Sure, but it works just as well with the loop, doesn't it? If you want me to remove it, I can. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Supersedes #113971
Things done
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)nix path-info -S
before and after)