From 562ccf681464215a6237aa504d746bec99ddbfa6 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sun, 20 Oct 2024 14:39:01 -0600
Subject: [PATCH 1/2] xournalpp: 1.2.3 -> 1.2.4

---
 pkgs/applications/graphics/xournalpp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix
index 921fef456289c..f2bd7e81a6e21 100644
--- a/pkgs/applications/graphics/xournalpp/default.nix
+++ b/pkgs/applications/graphics/xournalpp/default.nix
@@ -27,13 +27,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xournalpp";
-  version = "1.2.3";
+  version = "1.2.4";
 
   src = fetchFromGitHub {
     owner = "xournalpp";
     repo = "xournalpp";
     rev = "v${version}";
-    sha256 = "sha256-8UAAX/kixqiY9zEYs5eva0G2K2vlfnYd1yyVHMSfSeY=";
+    hash = "sha256-72e47fVP0c8KioRHUqyEQIUgrLm+xMPE2Mm6+2v7pZk=";
   };
 
   postPatch = ''

From 49769d859555ad417828e4d277b13e42b501d03f Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sun, 20 Oct 2024 14:39:37 -0600
Subject: [PATCH 2/2] xournalpp: format using nixfmt-rfc-style

---
 .../graphics/xournalpp/default.nix            | 67 +++++++++++--------
 1 file changed, 38 insertions(+), 29 deletions(-)

diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix
index f2bd7e81a6e21..64ce75717edba 100644
--- a/pkgs/applications/graphics/xournalpp/default.nix
+++ b/pkgs/applications/graphics/xournalpp/default.nix
@@ -1,28 +1,31 @@
-{ lib, stdenv
-, fetchFromGitHub
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
 
-, cmake
-, gettext
-, wrapGAppsHook3
-, pkg-config
+  cmake,
+  gettext,
+  wrapGAppsHook3,
+  pkg-config,
 
-, adwaita-icon-theme
-, alsa-lib
-, binutils
-, glib
-, gsettings-desktop-schemas
-, gtk3
-, gtksourceview4
-, librsvg
-, libsndfile
-, libxml2
-, libzip
-, pcre
-, poppler
-, portaudio
-, zlib
-# plugins
-, withLua ? true, lua
+  adwaita-icon-theme,
+  alsa-lib,
+  binutils,
+  glib,
+  gsettings-desktop-schemas,
+  gtk3,
+  gtksourceview4,
+  librsvg,
+  libsndfile,
+  libxml2,
+  libzip,
+  pcre,
+  poppler,
+  portaudio,
+  zlib,
+  # plugins
+  withLua ? true,
+  lua,
 }:
 
 stdenv.mkDerivation rec {
@@ -41,12 +44,18 @@ stdenv.mkDerivation rec {
       --replace-fail "addr2line" "${binutils}/bin/addr2line"
   '';
 
-  nativeBuildInputs = [ cmake gettext pkg-config wrapGAppsHook3 ];
+  nativeBuildInputs = [
+    cmake
+    gettext
+    pkg-config
+    wrapGAppsHook3
+  ];
 
   buildInputs =
     lib.optionals stdenv.hostPlatform.isLinux [
       alsa-lib
-    ] ++ [
+    ]
+    ++ [
       glib
       gsettings-desktop-schemas
       gtk3
@@ -72,11 +81,11 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Xournal++ is a handwriting Notetaking software with PDF annotation support";
-    homepage    = "https://xournalpp.github.io/";
-    changelog   = "https://github.com/xournalpp/xournalpp/blob/v${version}/CHANGELOG.md";
-    license     = licenses.gpl2Plus;
+    homepage = "https://xournalpp.github.io/";
+    changelog = "https://github.com/xournalpp/xournalpp/blob/v${version}/CHANGELOG.md";
+    license = licenses.gpl2Plus;
     maintainers = with maintainers; [ sikmir ];
-    platforms   = platforms.unix;
+    platforms = platforms.unix;
     mainProgram = "xournalpp";
   };
 }