diff options
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/nosql/neo4j/default.nix | 8 | ||||
-rw-r--r-- | pkgs/servers/plex/raw.nix | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index d9c9ddf8752bf..9147de6d4a1ed 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 ''; diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index b6618eb429d39..ff676b2776350 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -89,6 +89,7 @@ stdenv.mkDerivation rec { lnl7 pjones thoughtpolice + maxeaubrey ]; description = "Media library streaming server"; longDescription = '' |