summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2009-09-02 22:56:33 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2009-09-02 22:56:33 +0000
commit5de6c065d343b01bff0bb05009a554f514964f75 (patch)
treed2c94694e5bff61bb98256b76dc67889b6862228 /pkgs/top-level
parent99cd5a1679c369f23527d5a02f23a3ed1014b7c9 (diff)
downloadnixpkgs-5de6c065d343b01bff0bb05009a554f514964f75.tar
nixpkgs-5de6c065d343b01bff0bb05009a554f514964f75.tar.gz
nixpkgs-5de6c065d343b01bff0bb05009a554f514964f75.tar.bz2
nixpkgs-5de6c065d343b01bff0bb05009a554f514964f75.tar.lz
nixpkgs-5de6c065d343b01bff0bb05009a554f514964f75.tar.xz
nixpkgs-5de6c065d343b01bff0bb05009a554f514964f75.tar.zst
nixpkgs-5de6c065d343b01bff0bb05009a554f514964f75.zip
* Added scrot, a command-line screen capture utility.
svn path=/nixpkgs/trunk/; revision=16946
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix10
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 67f84dec252..cded990084a 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;