diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-11 20:52:07 -0600 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-13 19:14:10 -0600 |
| commit | bfbfe941abba2a0d7061c86d78b1e8facdeb17f8 (patch) | |
| tree | 2f6b86640ce155d6ecf2c5ec79811ad63c2cc703 /pkgs/servers/sql/mariadb | |
| parent | 1ba9fd335d90bca03b3868d3bf10c3d9a9de29c6 (diff) | |
| download | nixpkgs-bfbfe941abba2a0d7061c86d78b1e8facdeb17f8.tar nixpkgs-bfbfe941abba2a0d7061c86d78b1e8facdeb17f8.tar.gz nixpkgs-bfbfe941abba2a0d7061c86d78b1e8facdeb17f8.tar.bz2 nixpkgs-bfbfe941abba2a0d7061c86d78b1e8facdeb17f8.tar.lz nixpkgs-bfbfe941abba2a0d7061c86d78b1e8facdeb17f8.tar.xz nixpkgs-bfbfe941abba2a0d7061c86d78b1e8facdeb17f8.tar.zst nixpkgs-bfbfe941abba2a0d7061c86d78b1e8facdeb17f8.zip | |
treewide: use scons setup hook
Lots of packages can use it. Here is the list: - jackmix - klick - mixx - nova-filters - rhvoice - giv - mypaint - swift-im - bombono - mapnik - serf - nuitka - pyexiv2 - godot - hammer - toluapp - btanks - dxx-rebirth - endless-sky - globulation - the-powder-toy - fceux - gpsd - mongodb - rippled - mariadb - lprof
Diffstat (limited to 'pkgs/servers/sql/mariadb')
| -rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index d2a4406a973..6415fc95437 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -233,7 +233,7 @@ galera = stdenv.mkDerivation rec { buildInputs = [ asio boost check openssl scons ]; - patchPhase = '' + postPatch = '' substituteInPlace SConstruct \ --replace "boost_library_path = '''" "boost_library_path = '${boost}/lib'" ''; @@ -243,11 +243,9 @@ galera = stdenv.mkDerivation rec { export LIBPATH="${galeraLibs}/lib" ''; - buildPhase = '' - scons -j$NIX_BUILD_CORES ssl=1 system_asio=1 strict_build_flags=0 - ''; + sconsFlags = "ssl=1 system_asio=1 strict_build_flags=0"; - installPhase = '' + postInstall = '' # copied with modifications from scripts/packages/freebsd.sh GALERA_LICENSE_DIR="$share/licenses/${name}" install -d $out/{bin,lib/galera,share/doc/galera,$GALERA_LICENSE_DIR} |