diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-01-07 02:18:36 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-01-07 02:18:47 +0000 |
| commit | 36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2 (patch) | |
| tree | b3faaf573407b32aa645237a4d16b82778a39a92 /nixpkgs/pkgs/development/libraries/xbase | |
| parent | 4e31070265257dc67d120c27e0f75c2344fdfa9a (diff) | |
| parent | abf060725d7614bd3b9f96764262dfbc2f9c2199 (diff) | |
| download | nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.gz nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.bz2 nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.lz nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.xz nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.tar.zst nixlib-36f56d99fa0a0765c9f1de4a5f17a9b05830c3f2.zip | |
Add 'nixpkgs/' from commit 'abf060725d7614bd3b9f96764262dfbc2f9c2199'
git-subtree-dir: nixpkgs git-subtree-mainline: 4e31070265257dc67d120c27e0f75c2344fdfa9a git-subtree-split: abf060725d7614bd3b9f96764262dfbc2f9c2199
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/xbase')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/xbase/default.nix | 34 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/xbase/xbase-fixes.patch | 34 |
2 files changed, 68 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/xbase/default.nix b/nixpkgs/pkgs/development/libraries/xbase/default.nix new file mode 100644 index 000000000000..3dd2cb5b874c --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/xbase/default.nix @@ -0,0 +1,34 @@ +{ 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 + (fetchurl { + url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-db/xbase/files/xbase-3.1.2-gcc47.patch?revision=1.1"; + sha256 = "1kpcrkkcqdwl609yd0qxlvp743icz3vni13993sz6fkgn5lah8yl"; + }) + (fetchurl { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-db/xbase/files/xbase-3.1.2-gcc6.patch"; + sha256 = "1994pqiip5njkcmm5czb1bg6zdldkx1mpandgmvzqrja0iacf953"; + }) + (fetchurl { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-db/xbase/files/xbase-3.1.2-gcc7.patch"; + sha256 = "1304gn9dbdv8xf61crkg0fc8cal0h4qkyhlbqa8y618w134cxh1q"; + }) + ]; + + meta = with stdenv.lib; { + homepage = http://linux.techass.com/projects/xdb/; + description = "C++ class library formerly known as XDB"; + platforms = platforms.linux; + license = licenses.lgpl2; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/xbase/xbase-fixes.patch b/nixpkgs/pkgs/development/libraries/xbase/xbase-fixes.patch new file mode 100644 index 000000000000..a23658049b98 --- /dev/null +++ b/nixpkgs/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) + { |