From 198577297749d6a389df70bb05ec223294602f96 Mon Sep 17 00:00:00 2001 From: buffet Date: Fri, 25 Jan 2019 09:37:23 +0100 Subject: [PATCH 1/3] slurp: init at 1.0 --- pkgs/tools/misc/slurp/default.nix | 33 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/tools/misc/slurp/default.nix diff --git a/pkgs/tools/misc/slurp/default.nix b/pkgs/tools/misc/slurp/default.nix new file mode 100644 index 000000000000..1188251d8374 --- /dev/null +++ b/pkgs/tools/misc/slurp/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, cairo, meson, ninja, wayland, pkgconfig, wayland-protocols }: + +stdenv.mkDerivation rec { + name = "slurp-${version}"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "emersion"; + repo = "slurp"; + rev = "v${version}"; + sha256 = "03igv8r8n772xb0y7whhs1pa298l3d94jbnknaxpwp2n4fi04syb"; + }; + + nativeBuildInputs = [ + meson + ninja + pkgconfig + ]; + + buildInputs = [ + cairo + wayland + wayland-protocols + ]; + + meta = with stdenv.lib; { + description = "Grab images from a Wayland compositor"; + homepage = https://github.com/emersion/grim; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ buffet ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index efe9dbd2e629..cde759b36d38 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14138,6 +14138,8 @@ in slurm-spank-x11 = callPackage ../servers/computing/slurm-spank-x11 { }; + slurp = callPackage ../tools/misc/slurp { }; + systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { }; inherit (callPackages ../servers/http/tomcat { }) From d26acb339ab0a98efa9969adf9925085fe844fce Mon Sep 17 00:00:00 2001 From: buffet Date: Fri, 25 Jan 2019 09:45:59 +0100 Subject: [PATCH 2/3] Put slurp in correct position in all-packages --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cde759b36d38..7dc8ca329358 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14138,8 +14138,6 @@ in slurm-spank-x11 = callPackage ../servers/computing/slurm-spank-x11 { }; - slurp = callPackage ../tools/misc/slurp { }; - systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { }; inherit (callPackages ../servers/http/tomcat { }) @@ -19307,6 +19305,8 @@ in slrn = callPackage ../applications/networking/newsreaders/slrn { }; + slurp = callPackage ../tools/misc/slurp { }; + sniproxy = callPackage ../applications/networking/sniproxy { }; sooperlooper = callPackage ../applications/audio/sooperlooper { }; From 954e9f26c3e3371352ddc252e8055ef167a71398 Mon Sep 17 00:00:00 2001 From: buffet Date: Fri, 25 Jan 2019 10:06:56 +0100 Subject: [PATCH 3/3] Fixed homepage --- pkgs/tools/misc/slurp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/slurp/default.nix b/pkgs/tools/misc/slurp/default.nix index 1188251d8374..a729ea6381ac 100644 --- a/pkgs/tools/misc/slurp/default.nix +++ b/pkgs/tools/misc/slurp/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Grab images from a Wayland compositor"; - homepage = https://github.com/emersion/grim; + homepage = https://github.com/emersion/slurp; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ buffet ];