diff options
author | Ethel Morgan <eth@ethulhu.co.uk> | 2020-07-13 21:12:02 +0100 |
---|---|---|
committer | Ethel Morgan <eth@ethulhu.co.uk> | 2020-07-13 21:12:02 +0100 |
commit | 9d2b1e47a046233d38fd2141a4567bb03caa0f9c (patch) | |
tree | 6a859cb08cb22b93fc5525db1ccfdcbcea1f13c3 /pkgs/dlnatoad | |
parent | 87b8ba203956ca3468be059af7f83a3fcb69a5bf (diff) |
minor tweaks to dlnatoad's build definition
Diffstat (limited to '')
-rw-r--r-- | pkgs/dlnatoad/default.nix | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/dlnatoad/default.nix b/pkgs/dlnatoad/default.nix index 9102e1c..7388ed0 100644 --- a/pkgs/dlnatoad/default.nix +++ b/pkgs/dlnatoad/default.nix @@ -15,20 +15,16 @@ in stdenv.mkDerivation rec { sha256 = "060360q4n3li773rviq8ab1931l0gfk5w9dqpc0711prng5ywqy4"; }; - nativeBuildInputs = [ - maven - ]; buildInputs = [ - jre + maven makeWrapper ]; - pomFileDir = "dlnatoad/"; mavenDependenciesSHA256 = "1ly6xyhyal98pbwilx23rib3vkl2q9d0wpkrxhw12gzw1417kmxp"; fetchedMavenDeps = stdenv.mkDerivation { name = "dlnatoad-${version}-maven-deps"; - inherit src nativeBuildInputs; + inherit src buildInputs; buildPhase = '' mvn \ --threads $NIX_BUILD_CORES \ @@ -59,7 +55,7 @@ in stdenv.mkDerivation rec { mkdir -p $out/bin mkdir -p $out/share/java cp target/${snapshotJar} $out/share/java - makeWrapper ${pkgs.jre_headless}/bin/java $out/bin/dlnatoad \ + makeWrapper ${pkgs.jdk}/bin/java $out/bin/dlnatoad \ --add-flags "-jar $out/share/java/${snapshotJar}" ''; } |