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

Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"

Browse Source 
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
This commit is contained in:
Vladimír Čunát
2020-10-25 09:38:02 +01:00
parent 38f85a5bba
commit c778945806
93 changed files with 2696 additions and 783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,13 +34,12 @@ common = rec { # attributes common to both builds
name = "mariadb-${version}.tar.gz";
};
nativeBuildInputs = [ cmake pkgconfig ]
++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [
ncurses openssl zlib pcre libiconv curl
] ++ optionals stdenv.hostPlatform.isLinux [ libaio systemd libkrb5 ]
++ optionals stdenv.hostPlatform.isDarwin [ perl cctools CoreServices ]
++ optionals stdenv.hostPlatform.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ]
++ optional (!stdenv.hostPlatform.isDarwin && withStorageToku) [ jemalloc450 ]
++ optional (!stdenv.hostPlatform.isDarwin && !withStorageToku) [ jemalloc ];