xournalpp: move to by-name/, add update script, 1.2.9 -> 1.2.10 (#468704)
This commit is contained in:
+7
-4
@@ -25,18 +25,19 @@
|
||||
zlib,
|
||||
# plugins
|
||||
withLua ? true,
|
||||
lua,
|
||||
lua5_3,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xournalpp";
|
||||
version = "1.2.9";
|
||||
version = "1.2.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xournalpp";
|
||||
repo = "xournalpp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-YrLGa/BeZX3UeHY+n8LDStRJhEZfPe4Xjx20KtYBPow=";
|
||||
hash = "sha256-3M7ycbwKSmu8WUqC3anAi6GLPOex7gEndw/tDv0Ri7Q=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -69,7 +70,7 @@ stdenv.mkDerivation rec {
|
||||
portaudio
|
||||
zlib
|
||||
]
|
||||
++ lib.optional withLua lua;
|
||||
++ lib.optional withLua lua5_3;
|
||||
|
||||
buildFlags = [ "translations" ];
|
||||
|
||||
@@ -79,6 +80,8 @@ stdenv.mkDerivation rec {
|
||||
)
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Xournal++ is a handwriting Notetaking software with PDF annotation support";
|
||||
homepage = "https://xournalpp.github.io/";
|
||||
@@ -12600,10 +12600,6 @@ with pkgs;
|
||||
;
|
||||
};
|
||||
|
||||
xournalpp = callPackage ../applications/graphics/xournalpp {
|
||||
lua = lua5_3;
|
||||
};
|
||||
|
||||
xpdf = libsForQt5.callPackage ../applications/misc/xpdf { };
|
||||
|
||||
xmobar = haskellPackages.xmobar.bin;
|
||||
|
||||
Reference in New Issue
Block a user