diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2011-04-25 13:24:51 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2011-04-25 13:24:51 +0000 |
| commit | 89d42f7b57533e8ad5b9253ada21d6ad45384075 (patch) | |
| tree | 85cff86affea0b8f7bb42968a89fefd6fed3402e /pkgs/tools/misc/xburst-tools | |
| parent | 3642e1a5053071d941a3ca87133a2780a8e1fbc3 (diff) | |
| download | nixlib-89d42f7b57533e8ad5b9253ada21d6ad45384075.tar nixlib-89d42f7b57533e8ad5b9253ada21d6ad45384075.tar.gz nixlib-89d42f7b57533e8ad5b9253ada21d6ad45384075.tar.bz2 nixlib-89d42f7b57533e8ad5b9253ada21d6ad45384075.tar.lz nixlib-89d42f7b57533e8ad5b9253ada21d6ad45384075.tar.xz nixlib-89d42f7b57533e8ad5b9253ada21d6ad45384075.tar.zst nixlib-89d42f7b57533e8ad5b9253ada21d6ad45384075.zip | |
Now yes, I commit properly the xbursttools update. Not to the master HEAD, as
it fails to build. But to the lastest version I manage to build. svn path=/nixpkgs/trunk/; revision=26965
Diffstat (limited to 'pkgs/tools/misc/xburst-tools')
| -rw-r--r-- | pkgs/tools/misc/xburst-tools/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/tools/misc/xburst-tools/gcc-4.4.patch | 12 |
2 files changed, 6 insertions, 23 deletions
diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix index 6beb7368201c..63f5470aa9ec 100644 --- a/pkgs/tools/misc/xburst-tools/default.nix +++ b/pkgs/tools/misc/xburst-tools/default.nix @@ -2,29 +2,24 @@ , gccCross ? null }: let - version = "2011-04-08"; + version = "2011-03-08"; in stdenv.mkDerivation { name = "xburst-tools-${version}"; src = fetchgit { url = git://projects.qi-hardware.com/xburst-tools.git; - rev = "c070928faee41f36920a035eef0dbcabdfa8a2bb"; - sha256 = "66ea1a81b71bad599d76691f07a986f9bb2ccecf397e8486b661d8baace3460e"; + rev = "a3a38cabf1e854667d90f49f0b4487e28974a3a6"; + sha256 = "ac5671708cf9d18de79207530335f6781fa4bedf55288069786f4ecb971c4658"; }; - prePatch = '' - find . -name Makefile* -exec sed -i \ - -e s/mipsel-openwrt-linux-/mipsel-unknown-linux-/ {} \; - ''; - - patches = [ ./gcc-4.4.patch ]; - preConfigure = '' sh autogen.sh ''; - configureFlags = if gccCross != null then "--enable-firmware" else ""; + configureFlags = if gccCross != null then + "--enable-firmware CROSS_COMPILE=${gccCross.crossConfig}-" + else ""; # Not to strip cross build binaries (this is for the gcc-cross-wrapper) dontCrossStrip = true; diff --git a/pkgs/tools/misc/xburst-tools/gcc-4.4.patch b/pkgs/tools/misc/xburst-tools/gcc-4.4.patch deleted file mode 100644 index 79b7be3d34fa..000000000000 --- a/pkgs/tools/misc/xburst-tools/gcc-4.4.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 <stdio.h> -+#include <stdint.h> - #include <string.h> - #include <usb.h> - #include <time.h> |