public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

db-*: only use the osx.patch for db5 where it applies

Browse Source 
This unbreaks builds of all other versions (4.* and 6.*).
This commit is contained in:
Vladimír Čunát 2014-11-17 10:14:42 +01:00
parent adeb4fb56b
commit 5b0756cd21
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/libraries/db/db-5.3.nix
View File

@ -3,4 +3,5 @@
import ./generic.nix (args // rec { import ./generic.nix (args // rec {
version = "5.3.28"; version = "5.3.28";
sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0"; sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0";
extraPatches = [ ./osx.patch ];
}) })

4
pkgs/development/libraries/db/generic.nix
View File

@ -18,10 +18,6 @@ stdenv.mkDerivation rec {
patches = extraPatches; patches = extraPatches;
patchPhase = ''
patch src/dbinc/atomic.h < ${./osx.patch}
'';
configureFlags = [ configureFlags = [
(if cxxSupport then "--enable-cxx" else "--disable-cxx") (if cxxSupport then "--enable-cxx" else "--disable-cxx")
(if compat185 then "--enable-compat185" else "--disable-compat185") (if compat185 then "--enable-compat185" else "--disable-compat185")

4
pkgs/development/libraries/db/osx.patch
View File

@ -1,5 +1,5 @@
--- src/dbinc/atomic.h 2013-03-12 14:07:22.000000000 -0400 --- a/src/dbinc/atomic.h 2013-03-12 14:07:22.000000000 -0400
+++ src/dbinc/atomic.h.change 2013-03-12 14:06:35.000000000 -0400 +++ b/src/dbinc/atomic.h.change 2013-03-12 14:06:35.000000000 -0400
@@ -144,7 +144,7 @@ @@ -144,7 +144,7 @@
#define atomic_inc(env, p) __atomic_inc(p) #define atomic_inc(env, p) __atomic_inc(p)
#define atomic_dec(env, p) __atomic_dec(p) #define atomic_dec(env, p) __atomic_dec(p)