summary refs log tree commit diff
path: root/pkgs/applications/graphics
diff options
context:
space:
mode:
authorxeji <36407913+xeji@users.noreply.github.com>2019-03-13 23:24:09 +0100
committerGitHub <noreply@github.com>2019-03-13 23:24:09 +0100
commit2df7df966c82c746ade67b22a8df1bcce75367f8 (patch)
tree2e0908695b62e910900d3b114851acdda4d3d4a4 /pkgs/applications/graphics
parentc1d70b580180f62a808314411ba3a3b043c4ceff (diff)
parent1a39920ae0728331e5b9e639ddf90094594100b3 (diff)
downloadnixpkgs-2df7df966c82c746ade67b22a8df1bcce75367f8.tar
nixpkgs-2df7df966c82c746ade67b22a8df1bcce75367f8.tar.gz
nixpkgs-2df7df966c82c746ade67b22a8df1bcce75367f8.tar.bz2
nixpkgs-2df7df966c82c746ade67b22a8df1bcce75367f8.tar.lz
nixpkgs-2df7df966c82c746ade67b22a8df1bcce75367f8.tar.xz
nixpkgs-2df7df966c82c746ade67b22a8df1bcce75367f8.tar.zst
nixpkgs-2df7df966c82c746ade67b22a8df1bcce75367f8.zip
Merge pull request #57568 from fgaz/drawpile/2.1.2
 drawpile: 2.0.11 -> 2.1.2 
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r--pkgs/applications/graphics/drawpile/default.nix13
1 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix
index fd8f88aa53a..713eb4bfbb1 100644
--- a/pkgs/applications/graphics/drawpile/default.nix
+++ b/pkgs/applications/graphics/drawpile/default.nix
@@ -11,25 +11,34 @@
 , 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 = [
+    # 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
+    libvpx # WebM video export
   ];
   configurePhase = "cmake -DCMAKE_INSTALL_PREFIX=$out .";