Merge pull request #79165 from sikmir/xournalpp

xournalpp: 1.0.16 -> 1.0.17
This commit is contained in:
Florian Klink 2020-02-05 00:38:55 +01:00 committed by GitHub
commit b8a8fd0fd5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,5 +1,4 @@
{ stdenv
, lib
, fetchFromGitHub
, cmake
@ -23,13 +22,13 @@
stdenv.mkDerivation rec {
pname = "xournalpp";
version = "1.0.16";
version = "1.0.17";
src = fetchFromGitHub {
owner = "xournalpp";
repo = pname;
rev = version;
sha256 = "1bdmxxkcqpjvkckizmrz2839b4yspw4xv69bqkrrgkcyvxsr804w";
sha256 = "0xw2mcgnm4sa9hrhfgp669lfypw97drxjmz5w8i5whaprpvmkxzw";
};
nativeBuildInputs = [ cmake gettext pkgconfig wrapGAppsHook ];
@ -45,7 +44,9 @@ stdenv.mkDerivation rec {
portaudio
zlib
]
++ lib.optional withLua lua;
++ stdenv.lib.optional withLua lua;
buildFlags = "translations";
hardeningDisable = [ "format" ];
@ -53,9 +54,9 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Xournal++ is a handwriting Notetaking software with PDF annotation support";
homepage = https://github.com/xournalpp/xournalpp;
homepage = "https://github.com/xournalpp/xournalpp";
license = licenses.gpl2;
maintainers = with maintainers; [ andrew-d ];
maintainers = with maintainers; [ andrew-d sikmir ];
platforms = platforms.linux;
};
}