From 5de6c065d343b01bff0bb05009a554f514964f75 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 2 Sep 2009 22:56:33 +0000 Subject: [PATCH] * Added scrot, a command-line screen capture utility. svn path=/nixpkgs/trunk/; revision=16946 --- pkgs/development/libraries/giblib/default.nix | 16 ++++++++++++++++ pkgs/tools/graphics/scrot/default.nix | 17 +++++++++++++++++ pkgs/top-level/all-packages.nix | 10 +++++++++- 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/giblib/default.nix create mode 100644 pkgs/tools/graphics/scrot/default.nix diff --git a/pkgs/development/libraries/giblib/default.nix b/pkgs/development/libraries/giblib/default.nix new file mode 100644 index 000000000000..3ae649b67902 --- /dev/null +++ b/pkgs/development/libraries/giblib/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl, x11, imlib2 }: + +stdenv.mkDerivation rec { + name = "giblib-1.2.4"; + + src = fetchurl { + url = "http://linuxbrit.co.uk/downloads/${name}.tar.gz"; + sha256 = "1b4bmbmj52glq0s898lppkpzxlprq9aav49r06j2wx4dv3212rhp"; + }; + + buildInputs = [x11 imlib2]; + + meta = { + homepage = http://linuxbrit.co.uk/giblib/; + }; +} diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/tools/graphics/scrot/default.nix new file mode 100644 index 000000000000..e5f2ca83a9b0 --- /dev/null +++ b/pkgs/tools/graphics/scrot/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, giblib, x11 }: + +stdenv.mkDerivation rec { + name = "scrot-0.8"; + + src = fetchurl { + url = "http://linuxbrit.co.uk/downloads/${name}.tar.gz"; + sha256 = "1wll744rhb49lvr2zs6m93rdmiq59zm344jzqvijrdn24ksiqgb1"; + }; + + buildInputs = [ giblib x11 ]; + + meta = { + homepage = http://linuxbrit.co.uk/scrot/; + description = "A command-line screen capture utility"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67f84dec2524..cded990084a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1344,6 +1344,10 @@ let inherit fetchurl stdenv ncurses; }; + scrot = import ../tools/graphics/scrot { + inherit fetchurl stdenv giblib x11; + }; + seccure = import ../tools/security/seccure/0.4.nix { inherit fetchurl stdenv libgcrypt; }; @@ -3141,6 +3145,10 @@ let }; }; + giblib = import ../development/libraries/giblib { + inherit fetchurl stdenv x11 imlib2; + }; + glew = import ../development/libraries/glew { inherit fetchurl stdenv mesa x11 libtool; inherit (xlibs) libXmu libXi; @@ -6424,7 +6432,7 @@ let }; feh = import ../applications/graphics/feh { - inherit fetchurl stdenv x11 imlib2 libjpeg libpng; + inherit fetchurl stdenv x11 imlib2 libjpeg libpng giblib; }; firefox = firefox35;