diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-09-22 18:04:34 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-09-22 18:04:34 +0000 |
| commit | ca7165a043d399415d72975254a6389651ddf94d (patch) | |
| tree | b6494976a6162ff88ed61f0efb7ca6768bee11b9 | |
| parent | f726884df5aadd4b6c19919d2c1a136acad05634 (diff) | |
| download | nixpkgs-ca7165a043d399415d72975254a6389651ddf94d.tar nixpkgs-ca7165a043d399415d72975254a6389651ddf94d.tar.gz nixpkgs-ca7165a043d399415d72975254a6389651ddf94d.tar.bz2 nixpkgs-ca7165a043d399415d72975254a6389651ddf94d.tar.lz nixpkgs-ca7165a043d399415d72975254a6389651ddf94d.tar.xz nixpkgs-ca7165a043d399415d72975254a6389651ddf94d.tar.zst nixpkgs-ca7165a043d399415d72975254a6389651ddf94d.zip | |
Add xbase
svn path=/nixpkgs/trunk/; revision=23897
| -rw-r--r-- | pkgs/development/libraries/xbase/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/development/libraries/xbase/xbase-fixes.patch | 34 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 56 insertions, 0 deletions
diff --git a/pkgs/development/libraries/xbase/default.nix b/pkgs/development/libraries/xbase/default.nix new file mode 100644 index 00000000000..847ca6510e5 --- /dev/null +++ b/pkgs/development/libraries/xbase/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "xbase-3.1.2"; + + src = fetchurl { + url = mirror://sourceforge/xdb/xbase64-3.1.2.tar.gz; + sha256 = "17287kz1nmmm64y7zp9nhhl7slzlba09h6cc83w4mvsqwd9w882r"; + }; + + prePatch = "find . -type f -not -name configure -print0 | xargs -0 chmod -x"; + patches = [ ./xbase-fixes.patch ]; + + meta = { + homepage = http://linux.techass.com/projects/xdb/; + description = "XBase compatible C++ class library formerly known as XDB"; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.urkud ]; + }; +} diff --git a/pkgs/development/libraries/xbase/xbase-fixes.patch b/pkgs/development/libraries/xbase/xbase-fixes.patch new file mode 100644 index 00000000000..a23658049b9 --- /dev/null +++ b/pkgs/development/libraries/xbase/xbase-fixes.patch @@ -0,0 +1,34 @@ +diff --git a/xbase64/xbase64.cpp b/xbase64/xbase64.cpp +index fc5613d..2449535 100644 +--- a/xbase64/xbase64.cpp ++++ b/xbase64/xbase64.cpp +@@ -51,6 +51,7 @@ + #include <xbase64/xbase64.h> + #include <ctype.h> + #include <string.h> ++#include <cerrno> + + //#include <xbase64/xbexcept.h> + +diff --git a/xbase64/xblock.cpp b/xbase64/xblock.cpp +index c44cbb9..3554fc1 100644 +--- a/xbase64/xblock.cpp ++++ b/xbase64/xblock.cpp +@@ -53,6 +53,7 @@ + #endif + + #include <xbase64/xbase64.h> ++#include <cerrno> + + #ifdef HAVE_IO_H // windows locking + #include <io.h> +diff --git a/xbase64/xbnode.cpp b/xbase64/xbnode.cpp +index 5e688c1..3c652b3 100644 +--- a/xbase64/xbnode.cpp ++++ b/xbase64/xbnode.cpp +@@ -1,4 +1,4 @@ +-#include "xbNode.h" ++#include "xbnode.h" + + void xbNodeLink::AddNode(xbNodeLink* node) + { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27e13cbd563..ae61b6305a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3862,6 +3862,8 @@ let flex = flex2533; }; + xbase = callPackage ../development/libraries/xbase { }; + xineLib = callPackage ../development/libraries/xine-lib { }; xautolock = callPackage ../misc/screensavers/xautolock { }; |