Merge pull request #66987 from dtzWill/update/qownnotes-qt-mkderiv

qownnotes: 19.7.3 -> 19.8.6, use qt's mkDerivation
This commit is contained in:
worldofpeace 2019-08-20 12:16:31 -04:00 committed by GitHub
commit c0b62a782d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,22 +1,22 @@
{ stdenv, fetchurl, qmake, qttools, qtbase, qtsvg, qtdeclarative, qtxmlpatterns, qtwayland, qtwebsockets }: { mkDerivation, lib, fetchurl, qmake, qttools, qtbase, qtsvg, qtdeclarative, qtxmlpatterns, qtwayland, qtwebsockets, stdenv /* for isLinux */ }:
stdenv.mkDerivation rec { mkDerivation rec {
pname = "qownnotes"; pname = "qownnotes";
version = "19.7.3"; version = "19.8.6";
src = fetchurl { src = fetchurl {
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
# Can grab official version like so: # Can grab official version like so:
# $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-19.1.8.tar.xz.sha256 # $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-19.1.8.tar.xz.sha256
sha256 = "1d4an3yzr77c6pz5cv1vbsrl2v5r62qdckk3l5y5dcv7jikb1l8l"; sha256 = "a242dd15dc484baad39e737fe1af8529411f49a0d74994e6c78cf6bad4b733b6";
}; };
nativeBuildInputs = [ qmake qttools ]; nativeBuildInputs = [ qmake qttools ];
buildInputs = [ buildInputs = [
qtbase qtsvg qtdeclarative qtxmlpatterns qtwebsockets qtbase qtsvg qtdeclarative qtxmlpatterns qtwebsockets
] ++ stdenv.lib.optional stdenv.isLinux qtwayland; ] ++ lib.optional stdenv.isLinux qtwayland;
meta = with stdenv.lib; { meta = with lib; {
description = "Plain-text file notepad and todo-list manager with markdown support and ownCloud / Nextcloud integration"; description = "Plain-text file notepad and todo-list manager with markdown support and ownCloud / Nextcloud integration";
homepage = https://www.qownnotes.org/; homepage = https://www.qownnotes.org/;