Merge branch 'master' of github.com:NixOS/nixpkgs

This commit is contained in:
Sander van der Burg 2013-07-31 18:56:36 +02:00
commit dc183167cb
2 changed files with 34 additions and 0 deletions

View File

@ -0,0 +1,32 @@
{ stdenv, fetchurl, ncurses }:
stdenv.mkDerivation rec {
name = "dhex-${version}";
version = "0.68";
src = fetchurl {
url = "http://www.dettus.net/dhex/dhex_${version}.tar.gz";
sha256 = "126c34745b48a07448cfe36fe5913d37ec562ad72d3f732b99bd40f761f4da08";
};
buildInputs = [ ncurses ];
installPhase = ''
ensureDir $out/bin
ensureDir $out/share/man/man1
ensureDir $out/share/man/man5
cp dhex $out/bin
cp dhex.1 $out/share/man/man1
cp dhexrc.5 $out/share/man/man5
cp dhex_markers.5 $out/share/man/man5
cp dhex_searchlog.5 $out/share/man/man5
'';
meta = {
description = "A themeable hex editor with diff mode";
homepage = http://www.dettus.net/dhex/;
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [qknight];
};
}

View File

@ -3864,6 +3864,8 @@ let
dbus_libs = dbus.libs; dbus_libs = dbus.libs;
dbus_daemon = dbus.daemon; dbus_daemon = dbus.daemon;
dhex = callPackage ../applications/editors/dhex { };
dclib = callPackage ../development/libraries/dclib { }; dclib = callPackage ../development/libraries/dclib { };
directfb = callPackage ../development/libraries/directfb { }; directfb = callPackage ../development/libraries/directfb { };