diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-18 18:01:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-18 18:01:12 +0000 |
| commit | e15af378fb53182b63f645c34e4f01cc5879912c (patch) | |
| tree | 72650c051dc28267eacc3c6459c748536f3aad62 /pkgs/servers | |
| parent | 829200bc5a3dd290b1128cea35e2a6f1c94a0047 (diff) | |
| parent | eb0aa6ea31ea14724a5c8b6c10f3d9b282d77461 (diff) | |
| download | nixpkgs-e15af378fb53182b63f645c34e4f01cc5879912c.tar nixpkgs-e15af378fb53182b63f645c34e4f01cc5879912c.tar.gz nixpkgs-e15af378fb53182b63f645c34e4f01cc5879912c.tar.bz2 nixpkgs-e15af378fb53182b63f645c34e4f01cc5879912c.tar.lz nixpkgs-e15af378fb53182b63f645c34e4f01cc5879912c.tar.xz nixpkgs-e15af378fb53182b63f645c34e4f01cc5879912c.tar.zst nixpkgs-e15af378fb53182b63f645c34e4f01cc5879912c.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/nosql/neo4j/default.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index d9c9ddf8752..9147de6d4a1 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre8, which, gawk }: +{ lib, stdenv, fetchurl, makeWrapper, jre, which, gawk }: with lib; @@ -12,8 +12,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jre8 which gawk ]; - installPhase = '' mkdir -p "$out/share/neo4j" @@ -24,8 +22,8 @@ stdenv.mkDerivation rec { do makeWrapper "$out/share/neo4j/bin/$NEO4J_SCRIPT" \ "$out/bin/$NEO4J_SCRIPT" \ - --prefix PATH : "${lib.makeBinPath [ jre8 which gawk ]}" \ - --set JAVA_HOME "$jre8" + --prefix PATH : "${lib.makeBinPath [ jre which gawk ]}" \ + --set JAVA_HOME "${jre}" done ''; |