JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mariadb: move fix mytop to common stage

Browse Source
This commit is contained in:
Izorkin 2021-11-16 09:36:33 +03:00
parent bb553ddce5
commit be52b4640f
No known key found for this signature in database
GPG Key ID: 1436C1B3F3679F09
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/servers/sql/mariadb/default.nix
View File

@ -30,7 +30,8 @@ common = rec { # attributes common to both builds
};
nativeBuildInputs = [ cmake pkg-config ]
++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames
++ optional (!stdenv.hostPlatform.isDarwin) makeWrapper;
buildInputs = [
ncurses openssl zlib pcre2 libiconv curl
@ -96,6 +97,11 @@ common = rec { # attributes common to both builds
rm -r $out/lib/pkgconfig
'';
# perlPackages.DBDmysql is broken on darwin
postFixup = optionalString (!stdenv.hostPlatform.isDarwin) ''
wrapProgram $out/bin/mytop --set PATH ${makeBinPath [ less ncurses ]}
'';
passthru.mysqlVersion = "5.7";
passthru.tests = {
@ -146,7 +152,7 @@ server = stdenv.mkDerivation (common // {
outputs = [ "out" "man" ];
nativeBuildInputs = common.nativeBuildInputs ++ [ bison boost.dev ] ++ optional (!stdenv.hostPlatform.isDarwin) makeWrapper;
nativeBuildInputs = common.nativeBuildInputs ++ [ bison boost.dev ];
buildInputs = common.buildInputs ++ [
bzip2 lz4 lzo snappy xz zstd
@ -207,11 +213,6 @@ server = stdenv.mkDerivation (common // {
rm -r "$out"/OFF
'';
# perlPackages.DBDmysql is broken on darwin
postFixup = optionalString (!stdenv.hostPlatform.isDarwin) ''
wrapProgram $out/bin/mytop --set PATH ${makeBinPath [ less ncurses ]}
'';
CXXFLAGS = optionalString stdenv.hostPlatform.isi686 "-fpermissive";
});
in mariadb