pyrox.dev / nixpkgs
lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

This unbreaks builds of all other versions (4.* and 6.*).

Vladimír Čunát 5b0756cd adeb4fb5

+3 -6
+1
pkgs/development/libraries/db/db-5.3.nix
··· 3 3 import ./generic.nix (args // rec { 4 4 version = "5.3.28"; 5 5 sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0"; 6 + extraPatches = [ ./osx.patch ]; 6 7 })
-4
pkgs/development/libraries/db/generic.nix
··· 18 18 19 19 patches = extraPatches; 20 20 21 - patchPhase = '' 22 - patch src/dbinc/atomic.h < ${./osx.patch} 23 - ''; 24 - 25 21 configureFlags = [ 26 22 (if cxxSupport then "--enable-cxx" else "--disable-cxx") 27 23 (if compat185 then "--enable-compat185" else "--disable-compat185")
+2 -2
pkgs/development/libraries/db/osx.patch
··· 1 - --- src/dbinc/atomic.h 2013-03-12 14:07:22.000000000 -0400 2 - +++ src/dbinc/atomic.h.change 2013-03-12 14:06:35.000000000 -0400 1 + --- a/src/dbinc/atomic.h 2013-03-12 14:07:22.000000000 -0400 2 + +++ b/src/dbinc/atomic.h.change 2013-03-12 14:06:35.000000000 -0400 3 3 @@ -144,7 +144,7 @@ 4 4 #define atomic_inc(env, p) __atomic_inc(p) 5 5 #define atomic_dec(env, p) __atomic_dec(p)