diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2016-11-13 00:42:17 +0100 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2016-11-13 00:42:23 +0100 |
| commit | c7d1925b6eb805acbeba9e9324969bf67965d350 (patch) | |
| tree | 5b1e6a38b0e30416ccd478a71b4f97540739a501 /pkgs/development/libraries/db/generic.nix | |
| parent | 7e933af17344c049cdb13bffeafdb82f0927f3bc (diff) | |
Revert "db: fix build with libc++-3.8"
This reverts commit 7e933af17344c049cdb13bffeafdb82f0927f3bc.
Diffstat (limited to 'pkgs/development/libraries/db/generic.nix')
| -rw-r--r-- | pkgs/development/libraries/db/generic.nix | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix index 8e3eb5248e9ee..fdc828effdfbe 100644 --- a/pkgs/development/libraries/db/generic.nix +++ b/pkgs/development/libraries/db/generic.nix @@ -20,24 +20,6 @@ stdenv.mkDerivation (rec { patches = extraPatches; - # https://community.oracle.com/thread/3952592 - # this patch renames some sybols that conflict with libc++-3.8 - # symbols: atomic_compare_exchange, atomic_init, store - prePatch = '' - substituteInPlace src/dbinc/db.in \ - --replace '#define store' '#define store_db' - - substituteInPlace src/dbinc/atomic.h \ - --replace atomic_compare_exchange atomic_compare_exchange_db \ - --replace atomic_init atomic_init_db - substituteInPlace src/mp/*.c \ - --replace atomic_compare_exchange atomic_compare_exchange_db \ - --replace atomic_init atomic_init_db - substituteInPlace src/mutex/*.c \ - --replace atomic_compare_exchange atomic_compare_exchange_db \ - --replace atomic_init atomic_init_db - ''; - configureFlags = [ (if cxxSupport then "--enable-cxx" else "--disable-cxx") (if compat185 then "--enable-compat185" else "--disable-compat185") |