diff --git a/pkgs/development/libraries/confuse/default.nix b/pkgs/development/libraries/confuse/default.nix new file mode 100644 index 00000000000..c1702bae92a --- /dev/null +++ b/pkgs/development/libraries/confuse/default.nix @@ -0,0 +1,16 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "confuse"; + version = "2.7"; + src = fetchurl { + url = "http://savannah.nongnu.org/download/confuse/${name}-${version}.tar.gz"; + sha256 = "0y47r2ashz44wvnxdb18ivpmj8nxhw3y9bf7v9w0g5byhgyp89g3"; + }; + + meta = { + homepage = http://www.nongnu.org/confuse/; + description = "Configuration file parser library"; + license = "BSD"; + }; +} diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix new file mode 100644 index 00000000000..4f4de602c6c --- /dev/null +++ b/pkgs/tools/misc/xburst-tools/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchgit, libusb, autoconf, automake, confuse}: + +let + version = "2010-07-29"; +in +stdenv.mkDerivation { + name = "xburst-tools-${version}"; + + patches = [ ./gcc-4.4.patch ]; + + src = fetchgit { + url = git://projects.qi-hardware.com/xburst-tools.git; + rev = "00be212db22643ad602eaf60b30eb943f119e78d"; + sha256 = "66ea1a81b71bad599d76691f07a986f9bb2ccecf397e8486b661d8baace3460e"; + }; + + preConfigure = '' + sh autogen.sh + ''; + + buildInputs = [ libusb autoconf automake confuse ]; + + meta = { + description = "Qi tools to access the Ben Nanonote USB_BOOT mode"; + license = "GPLv3"; + homepage = http://www.linux-mtd.infradead.org/; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/tools/misc/xburst-tools/gcc-4.4.patch b/pkgs/tools/misc/xburst-tools/gcc-4.4.patch new file mode 100644 index 00000000000..79b7be3d34f --- /dev/null +++ b/pkgs/tools/misc/xburst-tools/gcc-4.4.patch @@ -0,0 +1,12 @@ +diff --git a/xbboot/host-app/host_main.c b/xbboot/host-app/host_main.c +index 8835869..0d6fcc0 100644 +--- a/xbboot/host-app/host_main.c ++++ b/xbboot/host-app/host_main.c +@@ -9,6 +9,7 @@ + // + + #include ++#include + #include + #include + #include diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9dab46baf42..790724085a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1946,6 +1946,10 @@ let inherit (xorg) imake; }; + xbursttools = import ../tools/misc/xburst-tools { + inherit stdenv fetchgit autoconf automake libusb confuse; + }; + xclip = import ../tools/misc/xclip { inherit fetchurl stdenv x11; inherit (xlibs) libXmu; @@ -3723,6 +3727,10 @@ let inherit stdenv fetchurl; }; + confuse = import ../development/libraries/confuse { + inherit fetchurl stdenv; + }; + consolekit = makeOverridable (import ../development/libraries/consolekit) { inherit stdenv fetchurl pkgconfig dbus_glib zlib pam polkit expat glib; inherit (xlibs) libX11;