From cca9bb1cc5e4593eaff0476a642b4e8a39c25260 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Sun, 19 Nov 2017 15:11:34 +0000 Subject: [PATCH] schemaspy: nitpicks --- .../tools/database/schemaspy/default.nix | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/database/schemaspy/default.nix b/pkgs/development/tools/database/schemaspy/default.nix index a1d355259865..ab62fdf3d523 100644 --- a/pkgs/development/tools/database/schemaspy/default.nix +++ b/pkgs/development/tools/database/schemaspy/default.nix @@ -13,25 +13,23 @@ stdenv.mkDerivation rec { buildInputs = [ jre - makeWrapper ]; - buildPhase = "true"; + nativeBuildInputs = [ + makeWrapper + ]; wrappedPath = lib.makeBinPath [ graphviz ]; - installPhase = - '' - mkdir -p "$out/share/java" - cp ${src} "$out/share/java/${name}.jar" + installPhase = '' + install -D ${src} "$out/share/java/${name}.jar" - mkdir -p $out/bin - makeWrapper ${jre}/bin/java $out/bin/schemaspy \ - --add-flags "-jar $out/share/java/${name}.jar" \ - --prefix PATH : "$wrappedPath" - ''; + makeWrapper ${jre}/bin/java $out/bin/schemaspy \ + --add-flags "-jar $out/share/java/${name}.jar" \ + --prefix PATH : "$wrappedPath" + ''; meta = with lib; { homepage = "http://schemaspy.org";