summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authordywedir <dywedir@pm.me>2019-02-26 11:30:54 +0200
committerdywedir <dywedir@pm.me>2019-02-26 11:30:54 +0200
commitb3521db3044454de899850431f26c21c8f67c33c (patch)
tree22ddedcb1043f01841eb69d9ca247b588e0bbfdb /pkgs
parent039087ac88697ffee1018dd4d9174b09a07a2930 (diff)
downloadnixpkgs-b3521db3044454de899850431f26c21c8f67c33c.tar
nixpkgs-b3521db3044454de899850431f26c21c8f67c33c.tar.gz
nixpkgs-b3521db3044454de899850431f26c21c8f67c33c.tar.bz2
nixpkgs-b3521db3044454de899850431f26c21c8f67c33c.tar.lz
nixpkgs-b3521db3044454de899850431f26c21c8f67c33c.tar.xz
nixpkgs-b3521db3044454de899850431f26c21c8f67c33c.tar.zst
nixpkgs-b3521db3044454de899850431f26c21c8f67c33c.zip
slurp: 1.0.1 -> 1.1.0
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/tools/misc/slurp/default.nix15
1 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/tools/misc/slurp/default.nix b/pkgs/tools/misc/slurp/default.nix
index 8b7f1d38744..35233d97d56 100644
--- a/pkgs/tools/misc/slurp/default.nix
+++ b/pkgs/tools/misc/slurp/default.nix
@@ -1,21 +1,24 @@
-{ stdenv, fetchFromGitHub, cairo, meson, ninja, wayland, pkgconfig, wayland-protocols }:
+{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig
+, cairo, wayland, wayland-protocols
+, buildDocs ? true, scdoc
+}:
 
 stdenv.mkDerivation rec {
-  name = "slurp-${version}";
-  version = "1.0.1";
+  pname = "slurp";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "emersion";
     repo = "slurp";
     rev = "v${version}";
-    sha256 = "072lkwhpvr753wfqzmd994bnhbrgfavxcgqcyml7abab28sdhs1y";
+    sha256 = "15fqspg3cjl830l95ibibprxf9p13mc2rpyf9bdwsdx2f4qrkq62";
   };
 
   nativeBuildInputs = [
     meson
     ninja
     pkgconfig
-  ];
+  ] ++ stdenv.lib.optional buildDocs scdoc;
 
   buildInputs = [
     cairo
@@ -23,6 +26,8 @@ stdenv.mkDerivation rec {
     wayland-protocols
   ];
 
+  mesonFlags = stdenv.lib.optional buildDocs "-Dman-pages=enabled";
+
   meta = with stdenv.lib; {
     description = "Select a region in a Wayland compositor";
     homepage = https://github.com/emersion/slurp;