imagej: reformat expression

- Use 1 line per input argument.
- Don't use let ... in if not needed.
- Use ${version} in url string.
- Run hooks in explicit installPhase.

(cherry picked from commit e1d6051d81835079f0e37e1d5fc5f029f32df512)
This commit is contained in:
Doron Behar 2021-06-25 10:41:59 +03:00 committed by Harrison Houghton
parent 9f371831e2
commit 487300c6aa

View File

@ -1,36 +1,41 @@
{ lib, stdenv, fetchurl, jre, unzip, makeWrapper }: { lib
, stdenv
, fetchurl
, jre
, unzip
, makeWrapper
}:
# Note: stdenv.mkDerivation {
# - User config dir is hard coded by upstream to $HOME/.imagej on linux systems
# and to $HOME/Library/Preferences on macOS.
# (The current trend appears to be to use $HOME/.config/imagej
# on linux systems, but we here do not attempt to fix it.)
let
imagej150 = stdenv.mkDerivation {
pname = "imagej"; pname = "imagej";
version = "150"; version = "150";
src = fetchurl { src = fetchurl {
url = "https://wsr.imagej.net/distros/cross-platform/ij150.zip"; url = "https://wsr.imagej.net/distros/cross-platform/ij${version}.zip";
sha256 = "97aba6fc5eb908f5160243aebcdc4965726693cb1353d9c0d71b8f5dd832cb7b"; sha256 = "97aba6fc5eb908f5160243aebcdc4965726693cb1353d9c0d71b8f5dd832cb7b";
}; };
nativeBuildInputs = [ makeWrapper unzip ]; nativeBuildInputs = [ makeWrapper unzip ];
passthru = {
inherit jre; inherit jre;
};
# JAR files that are intended to be used by other packages # JAR files that are intended to be used by other packages
# should go to $out/share/java. # should go to $out/share/java.
# (Some uses ij.jar as a library not as a standalone program.) # (Some uses ij.jar as a library not as a standalone program.)
installPhase = '' installPhase = ''
mkdir -p $out/share/java runHook preInstall
mkdir -p $out/share/java $out/bin
# Read permisssion suffices for the jar and others. # Read permisssion suffices for the jar and others.
# Simple cp shall clear suid bits, if any. # Simple cp shall clear suid bits, if any.
cp ij.jar $out/share/java cp ij.jar $out/share/java
cp -dR luts macros plugins $out/share cp -dR luts macros plugins $out/share
mkdir $out/bin
makeWrapper ${jre}/bin/java $out/bin/imagej \ makeWrapper ${jre}/bin/java $out/bin/imagej \
--add-flags "-jar $out/share/java/ij.jar -ijpath $out/share" --add-flags "-jar $out/share/java/ij.jar -ijpath $out/share"
runHook postInstall
''; '';
meta = with lib; { meta = with lib; {
homepage = "https://imagej.nih.gov/ij/"; homepage = "https://imagej.nih.gov/ij/";
description = "Image processing and analysis in Java"; description = "Image processing and analysis in Java";
@ -40,9 +45,7 @@ let
It runs on any computer with a Java 1.4 or later virtual machine. It runs on any computer with a Java 1.4 or later virtual machine.
''; '';
license = licenses.publicDomain; license = licenses.publicDomain;
platforms = with platforms; linux ++ darwin; platforms = platforms.unix;
maintainers = with maintainers; [ yuriaisaka ]; maintainers = with maintainers; [ yuriaisaka ];
}; };
}; }
in
imagej150