JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #48308 from sephalon/jameica

Browse Source 
jameica: 2.8.1 -> 2.8.2
This commit is contained in:
Jörg Thalheim 2018-10-13 09:59:08 +01:00 committed by GitHub
commit 0b57482b46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/applications/office/jameica/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, ant, jdk, jre, xmlstarlet, gtk2, glib, xorg, Cocoa }:
{ stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, ant, jdk, jre, gtk2, glib, xorg, Cocoa }:
let
_version = "2.8.1";
_build = "449";
_version = "2.8.2";
_build = "450";
version = "${_version}-${_build}";
name = "jameica-${version}";
@ -23,7 +23,7 @@ in
stdenv.mkDerivation rec {
inherit name version;
nativeBuildInputs = [ ant jdk makeWrapper xmlstarlet ];
nativeBuildInputs = [ ant jdk makeWrapper ];
buildInputs = stdenv.lib.optionals stdenv.isLinux [ gtk2 glib xorg.libXtst ]
++ stdenv.lib.optional stdenv.isDarwin Cocoa;
@ -31,23 +31,13 @@ stdenv.mkDerivation rec {
owner = "willuhn";
repo = "jameica";
rev = "V_${builtins.replaceStrings ["."] ["_"] _version}_BUILD_${_build}";
sha256 = "1w25lxjskn1yxllbv0vgvcc9f9xvgv9430dm4b59ia9baf98syd2";
sha256 = "197n35lvx51k6cbp3fhndvfb38sikl4mjqcd42fgvn2khy2sij68";
};
# there is also a build.gradle, but it only seems to be used to vendor 3rd party libraries
# and is not able to build the application itself
buildPhase = ''
(cd build; ant init compile jar)
'';
# jameica itself loads ./plugin.xml to determine it's version.
# Unfortunately, the version attribute there seems to be wrong,
# so it thinks it's older than it really is,
# and refuses to load plugins destined for its version.
# Set version manually to workaround that.
postPatch = ''
xml ed -u '/system/@version' -v '${version}' plugin.xml > plugin.xml.new
mv plugin.xml.new plugin.xml
(cd build; ant -Dsystem.version=${version} init compile jar)
'';
installPhase = ''
@ -73,7 +63,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = https://www.willuhn.de/products/jameica/;
description = "Free Runtime Environment for Java Applications.";
description = "Free Runtime Environment for Java Applications";
longDescription = ''
Runtime Environment for plugins like Hibiscus (HBCI Online Banking),
SynTAX (accounting) and JVerein (club management).