diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-05 10:28:52 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-05 10:28:52 +0100 |
| commit | 76a439239eb310d9ad76d998b34d5d3bc0e37acb (patch) | |
| tree | 69e2f87d4a1ec8f8962d35e330188afcf8f88dcb /pkgs/servers/sql | |
| parent | 080f1e7f5c94a171d070d1990104e06880589ca0 (diff) | |
| parent | 2b3d2dbaf9f76519082126074b3aae26d2ced67f (diff) | |
| download | nixlib-76a439239eb310d9ad76d998b34d5d3bc0e37acb.tar nixlib-76a439239eb310d9ad76d998b34d5d3bc0e37acb.tar.gz nixlib-76a439239eb310d9ad76d998b34d5d3bc0e37acb.tar.bz2 nixlib-76a439239eb310d9ad76d998b34d5d3bc0e37acb.tar.lz nixlib-76a439239eb310d9ad76d998b34d5d3bc0e37acb.tar.xz nixlib-76a439239eb310d9ad76d998b34d5d3bc0e37acb.tar.zst nixlib-76a439239eb310d9ad76d998b34d5d3bc0e37acb.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers/sql')
| -rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index d451c1dab5c9..c86ed3defbcc 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -194,7 +194,7 @@ server = stdenv.mkDerivation (common // { # perlPackages.DBDmysql is broken on darwin postFixup = optionalString (!stdenv.hostPlatform.isDarwin) '' - wrapProgram $out/bin/mytop --set PATH ${less}/bin/less + wrapProgram $out/bin/mytop --set PATH ${makeBinPath [ less ncurses ]} ''; CXXFLAGS = optionalString stdenv.hostPlatform.isi686 "-fpermissive"; |