Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 53255e2ab723
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0b57482b4640
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 13, 2018

  1. jameica: 2.8.1 -> 2.8.2

    @sephalon
    sephalon committed Oct 13, 2018
    Copy the full SHA
    fc92b61 View commit details

  2. Merge pull request #48308 from sephalon/jameica 

    jameica: 2.8.1 -> 2.8.2
    @Mic92
    Mic92 authored Oct 13, 2018
    Copy the full SHA
    0b57482 View commit details
Showing with 7 additions and 17 deletions.
  1. +7 −17 pkgs/applications/office/jameica/default.nix
24 changes: 7 additions & 17 deletions pkgs/applications/office/jameica/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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,31 +23,21 @@ 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;

src = fetchFromGitHub {
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).