From 8cc2a2ffffe52ca976f697ace328a65482703b85 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Wed, 13 Mar 2019 11:29:56 +0100 Subject: [PATCH 1/2] drawpile: 2.0.11 -> 2.1.2 --- pkgs/applications/graphics/drawpile/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix index fd8f88aa53ad..40d47905c77e 100644 --- a/pkgs/applications/graphics/drawpile/default.nix +++ b/pkgs/applications/graphics/drawpile/default.nix @@ -11,15 +11,20 @@ , libmicrohttpd , giflib , miniupnpc +, extra-cmake-modules +, libvpx }: stdenv.mkDerivation rec { name = "drawpile-${version}"; - version = "2.0.11"; + version = "2.1.2"; src = fetchurl { url = "https://drawpile.net/files/src/drawpile-${version}.tar.gz"; - sha256 = "0h018rxhc0lwpqwmlihalz634nd0xaafk4p2b782djjd87irnjpk"; + sha256 = "02kkn317w9xhdqq2b4fq2bvipsnbp9945b6vghx3q2p6mckr9mhi"; }; + nativeBuildInputs = [ + extra-cmake-modules + ]; buildInputs = [ cmake qtbase qtsvg qtmultimedia qttools @@ -30,6 +35,7 @@ stdenv.mkDerivation rec { giflib # gif animation export support miniupnpc # automatic port forwarding kdnssd # local server discovery with Zeroconf + libvpx # WebM video export ]; configurePhase = "cmake -DCMAKE_INSTALL_PREFIX=$out ."; From 1a39920ae0728331e5b9e639ddf90094594100b3 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Wed, 13 Mar 2019 11:30:46 +0100 Subject: [PATCH 2/2] drawpile: add some comments explaining the deps --- pkgs/applications/graphics/drawpile/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix index 40d47905c77e..713eb4bfbb12 100644 --- a/pkgs/applications/graphics/drawpile/default.nix +++ b/pkgs/applications/graphics/drawpile/default.nix @@ -26,12 +26,15 @@ stdenv.mkDerivation rec { extra-cmake-modules ]; buildInputs = [ + # common deps: cmake qtbase qtsvg qtmultimedia qttools karchive # optional deps: + # server-specific: libsodium # ext-auth support libmicrohttpd # HTTP admin api + # client-specific: giflib # gif animation export support miniupnpc # automatic port forwarding kdnssd # local server discovery with Zeroconf