diff options
| -rw-r--r-- | lib/maintainers.nix | 1 | ||||
| -rw-r--r-- | pkgs/tools/graphics/maim/default.nix | 30 | ||||
| -rw-r--r-- | pkgs/tools/misc/slop/default.nix | 24 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
4 files changed, 59 insertions, 0 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 018d515155a46..10036c1936045 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -144,6 +144,7 @@ marcweber = "Marc Weber <marco-oweber@gmx.de>"; matejc = "Matej Cotman <cotman.matej@gmail.com>"; matthiasbeyer = "Matthias Beyer <mail@beyermatthias.de>"; + mbakke = "Marius Bakke <ymse@tuta.io>"; meditans = "Carlo Nucera <meditans@gmail.com>"; meisternu = "Matt Miemiec <meister@krutt.org>"; michelk = "Michel Kuhlmann <michel@kuhlmanns.info>"; diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix new file mode 100644 index 0000000000000..425fa5fb6cd2c --- /dev/null +++ b/pkgs/tools/graphics/maim/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, cmake, gengetopt, imlib2, libXrandr, libXfixes +, cppcheck}: + +stdenv.mkDerivation rec { + name = "maim-${version}"; + version = "3.3.41"; + + src = fetchurl { + url = "https://github.com/naelstrof/maim/archive/v${version}.tar.gz"; + sha256 = "12p9zd4skxds26hicy6hrxkxnhbqv1c5ys1h6jchaypvwdggcgnc"; + }; + + buildInputs = [ cmake gengetopt imlib2 libXrandr libXfixes ] + ++ stdenv.lib.optional doCheck cppcheck; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/naelstrof/maim; + description = "A command-line screenshot utility"; + longDescription = '' + maim (make image) takes screenshots of your desktop. It has options to + take only a region, and relies on slop to query for regions. maim is + supposed to be an improved scrot. + ''; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = with maintainers; [ mbakke ]; + }; +} diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix new file mode 100644 index 0000000000000..62ec5ab2d63ed --- /dev/null +++ b/pkgs/tools/misc/slop/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, cmake, gengetopt, libX11, libXext, cppcheck}: + +stdenv.mkDerivation rec { + name = "slop-${version}"; + version = "4.1.15"; + + src = fetchurl { + url = "https://github.com/naelstrof/slop/archive/v${version}.tar.gz"; + sha256 = "e20fd47de898abcb537c8100faed859eef4955d7784dbc52470570dae403f02e"; + }; + + buildInputs = [ cmake gengetopt libX11 libXext ] + ++ stdenv.lib.optional doCheck cppcheck; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/naelstrof/slop; + description = "Queries a selection from the user and prints to stdout"; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = with maintainers; [ mbakke ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 278c8d623796c..bc4a490902dab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2074,6 +2074,8 @@ let guile = guile_1_8; }; + maim = callPackage ../tools/graphics/maim {}; + mairix = callPackage ../tools/text/mairix { }; makemkv = callPackage ../applications/video/makemkv { }; @@ -12382,6 +12384,8 @@ let slmenu = callPackage ../applications/misc/slmenu {}; + slop = callPackage ../tools/misc/slop {}; + slrn = callPackage ../applications/networking/newsreaders/slrn { }; sooperlooper = callPackage ../applications/audio/sooperlooper { }; |