Skip to content

Commit

Permalink
xournalpp: 1.2.3 -> 1.2.4 (#350094)
Browse files Browse the repository at this point in the history
  • Loading branch information
sikmir authored Oct 21, 2024
2 parents 26619c1 + 49769d8 commit 394fbda
Showing 1 changed file with 40 additions and 31 deletions.
71 changes: 40 additions & 31 deletions pkgs/applications/graphics/xournalpp/default.nix
Original file line number Diff line number Diff line change
@@ -1,52 +1,61 @@
{ 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 {
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 = ''
substituteInPlace src/util/Stacktrace.cpp \
--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
Expand All @@ -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";
};
}

0 comments on commit 394fbda

Please sign in to comment.