Skip to content

Commit

Permalink
moneydance: Update to OpenJDK 23
Browse files Browse the repository at this point in the history
This updates nixpkgs-unstable to get OpenJDK 23 and picks up the Moneydance
packaging changes from NixOS/nixpkgs#344544. Props to @emilazy for swimming
against the ridiculous current of OpenJDK releases.
  • Loading branch information
lucasbergman committed Nov 15, 2024
1 parent f9171c6 commit f40289c
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
6 changes: 3 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion pkgs/default.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
pkgs,
pkgs-unstable,
...
}:
{
gcp-secret-subst = pkgs.callPackage ./gcp-secret-subst { };
moneydance = pkgs.callPackage ./moneydance.nix { };
moneydance = pkgs.callPackage ./moneydance.nix { openjdk23 = pkgs-unstable.openjdk23; };
prometheus-jmx = pkgs.callPackage ./prometheus-jmx.nix { };
}
27 changes: 13 additions & 14 deletions pkgs/moneydance.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@
stdenv,
fetchzip,
makeWrapper,
openjdk21,
openjfx21,
openjdk23,
jvmFlags ? [ ],
}:
let
jdk = openjdk21.override { enableJavaFX = true; };
jdk = openjdk23.override {
enableJavaFX = true;
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "moneydance";
Expand All @@ -20,15 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
};

nativeBuildInputs = [ makeWrapper ];
buildInputs = [
jdk
openjfx21
];

dontConfigure = true;
dontUnpack = true;
dontBuild = true;
dontFixup = true;
buildInputs = [ jdk ];

# Note the double escaping in the call to makeWrapper. The escapeShellArgs
# call quotes each element of the flags list as a word[1] and returns a
Expand Down Expand Up @@ -65,9 +58,15 @@ stdenv.mkDerivation (finalAttrs: {

meta = {
homepage = "https://infinitekind.com/moneydance";
description = "An easy to use and full-featured personal finance app that doesn't compromise your privacy";
changelog = "https://infinitekind.com/stabledl/2024_5118/changelog.txt";
description = "Easy to use and full-featured personal finance app that doesn't compromise your privacy";
sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
license = lib.licenses.unfree;
platforms = jdk.meta.platforms;
# Darwin refers to Zulu Java, which breaks the evaluation of this derivation
# for some reason
#
# https://github.com/NixOS/nixpkgs/pull/306372#issuecomment-2111688236
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.lucasbergman ];
};
})

0 comments on commit f40289c

Please sign in to comment.