swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 04:49:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

xournalpp: 1.0.8 -> 1.0.12

Browse source 
* revisit plugin support, drop old patch
* use lua5_3 as it seems to expect (require)
* disable format hardening, fix build
This commit is contained in:
Will Dietz 2019-05-30 07:22:43 -05:00
parent 67abc01e4c
commit 8ea66b0151
No known key found for this signature in database
GPG key ID: EBB0EA4124809D02
2 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
pkgs/applications/graphics/xournalpp/default.nix
View file

@ -1,7 +1,6 @@
{ stdenv { stdenv
, lib , lib
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, cmake , cmake
, gettext , gettext
@ -14,6 +13,7 @@
, hicolor-icon-theme , hicolor-icon-theme
, libsndfile , libsndfile
, libxml2 , libxml2
, libzip
, pcre , pcre
, poppler , poppler
, portaudio , portaudio
@ -22,31 +22,20 @@
# Plugins don't appear to be working in this version, so disable them by not # Plugins don't appear to be working in this version, so disable them by not
# building with Lua support by default. In a future version, try switching this # building with Lua support by default. In a future version, try switching this
# to 'true' and seeing if the top-level Plugin menu appears. # to 'true' and seeing if the top-level Plugin menu appears.
, withLua ? false, lua , withLua ? true, lua
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "xournalpp-${version}"; name = "xournalpp-${version}";
version = "1.0.8"; version = "1.0.12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xournalpp"; owner = "xournalpp";
repo = "xournalpp"; repo = "xournalpp";
rev = version; rev = version;
sha256 = "01q84xjp9z1krna10gjj562km6i3wdq8cg7paxax1k6bh52ryvf6"; sha256 = "0yg70hsx58s3wb5kzccivrqa7kvmdapygxmif1j64hddah2rqcn9";
}; };
patches = [
# This patch removes the unused 'xopp-recording.sh' file which breaks the
# cmake build; this patch isn't in a release yet, and should be removed at
# or after 1.0.9 is released.
(fetchpatch {
name = "remove-xopp-recording.sh.patch";
url = "https://github.com/xournalpp/xournalpp/commit/a17a3f2c80c607a22d0fdeb66d38358bea7e4d85.patch";
sha256 = "10pcpvklm6kr0lv2xrsbpg2037ni9j6dmxgjf56p466l3gz60iwy";
})
];
nativeBuildInputs = [ cmake gettext pkgconfig wrapGAppsHook ]; nativeBuildInputs = [ cmake gettext pkgconfig wrapGAppsHook ];
buildInputs = buildInputs =
[ glib [ glib
@ -55,6 +44,7 @@ stdenv.mkDerivation rec {
hicolor-icon-theme hicolor-icon-theme
libsndfile libsndfile
libxml2 libxml2
libzip
pcre pcre
poppler poppler
portaudio portaudio
@ -62,6 +52,8 @@ stdenv.mkDerivation rec {
] ]
++ lib.optional withLua lua; ++ lib.optional withLua lua;
hardeningDisable = [ "format" ];
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {

4
pkgs/top-level/all-packages.nix
View file

@ -21007,7 +21007,9 @@ in
inherit (gnome2) libgnomeprint libgnomeprintui libgnomecanvas; inherit (gnome2) libgnomeprint libgnomeprintui libgnomecanvas;
}; };
xournalpp = callPackage ../applications/graphics/xournalpp { }; xournalpp = callPackage ../applications/graphics/xournalpp {
lua = lua5_3;
};
apvlv = callPackage ../applications/misc/apvlv { }; apvlv = callPackage ../applications/misc/apvlv { };