From c85e2260e92eb0099f908861a9ffcdbe9fb435bc Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 23 Nov 2021 12:58:13 +0100 Subject: [PATCH] jdom: remove builder.sh --- pkgs/development/libraries/java/jdom/builder.sh | 6 ------ pkgs/development/libraries/java/jdom/default.nix | 14 +++++++++----- 2 files changed, 9 insertions(+), 11 deletions(-) delete mode 100755 pkgs/development/libraries/java/jdom/builder.sh diff --git a/pkgs/development/libraries/java/jdom/builder.sh b/pkgs/development/libraries/java/jdom/builder.sh deleted file mode 100755 index dbec4b6f3e0e..000000000000 --- a/pkgs/development/libraries/java/jdom/builder.sh +++ /dev/null @@ -1,6 +0,0 @@ -set -e -source $stdenv/setup - -tar zxvf $src -mkdir -p $out -mv * $out diff --git a/pkgs/development/libraries/java/jdom/default.nix b/pkgs/development/libraries/java/jdom/default.nix index 4bb90dd98874..cbbec60ad32b 100644 --- a/pkgs/development/libraries/java/jdom/default.nix +++ b/pkgs/development/libraries/java/jdom/default.nix @@ -1,14 +1,18 @@ -{lib, stdenv, fetchurl} : +{ lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "jdom-1.0"; - builder = ./builder.sh; +stdenv.mkDerivation rec { + pname = "jdom"; + version = "1.0"; src = fetchurl { - url = "http://www.jdom.org/dist/binary/jdom-1.0.tar.gz"; + url = "http://www.jdom.org/dist/binary/jdom-${version}.tar.gz"; sha256 = "1igmxzcy0s25zcy9vmcw0kd13lh60r0b4qg8lnp1jic33f427pxf"; }; + buildCommand = '' + cp -r ./ $out + ''; + meta = with lib; { description = "Java-based solution for accessing, manipulating, and outputting XML data from Java code"; homepage = "http://www.jdom.org";