diff options
author | Ben Siraphob <bensiraphob@gmail.com> | 2021-02-07 16:17:39 +0700 |
---|---|---|
committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-02-19 20:09:16 +0700 |
commit | e03c068af5c9ca950214cd6c3b5cfe67f595da88 (patch) | |
tree | 3a2072763efa4dae7237eeecf46fc6a95ddcd215 /pkgs/servers/nosql | |
parent | 06c2bba257d77f2aeada7f943244d9afd5998645 (diff) | |
download | nixpkgs-e03c068af5c9ca950214cd6c3b5cfe67f595da88.tar nixpkgs-e03c068af5c9ca950214cd6c3b5cfe67f595da88.tar.gz nixpkgs-e03c068af5c9ca950214cd6c3b5cfe67f595da88.tar.bz2 nixpkgs-e03c068af5c9ca950214cd6c3b5cfe67f595da88.tar.lz nixpkgs-e03c068af5c9ca950214cd6c3b5cfe67f595da88.tar.xz nixpkgs-e03c068af5c9ca950214cd6c3b5cfe67f595da88.tar.zst nixpkgs-e03c068af5c9ca950214cd6c3b5cfe67f595da88.zip |
treewide: makeWrapper buildInputs to nativeBuildInputs
Diffstat (limited to 'pkgs/servers/nosql')
-rw-r--r-- | pkgs/servers/nosql/neo4j/default.nix | 3 | ||||
-rw-r--r-- | pkgs/servers/nosql/rethinkdb/default.nix | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index 684cdbe287c..d9c9ddf8752 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1zjb6cgk2lpzx6pq1cs5fh65in6b5ccpl1cgfiglgpjc948mnhzv"; }; - buildInputs = [ makeWrapper jre8 which gawk ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre8 which gawk ]; installPhase = '' diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index 558fdad9841..4c5be92e765 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { makeFlags = [ "rethinkdb" ]; - buildInputs = [ protobuf boost zlib curl openssl icu makeWrapper ] + buildInputs = [ protobuf boost zlib curl openssl icu ] ++ lib.optional (!stdenv.isDarwin) jemalloc ++ lib.optional stdenv.isDarwin libtool; - nativeBuildInputs = [ which m4 python2Packages.python ]; + nativeBuildInputs = [ which m4 python2Packages.python makeWrapper ]; enableParallelBuilding = true; |