From 9d2b1e47a046233d38fd2141a4567bb03caa0f9c Mon Sep 17 00:00:00 2001
From: Ethel Morgan <eth@ethulhu.co.uk>
Date: Mon, 13 Jul 2020 21:12:02 +0100
Subject: minor tweaks to dlnatoad's build definition

---
 pkgs/dlnatoad/default.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'pkgs')

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}"
   '';
 }
-- 
cgit v1.2.3