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/db-4.8.nix | |
| parent | 7e933af17344c049cdb13bffeafdb82f0927f3bc (diff) | |
Revert "db: fix build with libc++-3.8"
This reverts commit 7e933af17344c049cdb13bffeafdb82f0927f3bc.
Diffstat (limited to 'pkgs/development/libraries/db/db-4.8.nix')
| -rw-r--r-- | pkgs/development/libraries/db/db-4.8.nix | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/pkgs/development/libraries/db/db-4.8.nix b/pkgs/development/libraries/db/db-4.8.nix index f631a032102ed..40869a865ae5f 100644 --- a/pkgs/development/libraries/db/db-4.8.nix +++ b/pkgs/development/libraries/db/db-4.8.nix @@ -5,23 +5,5 @@ import ./generic.nix (args // rec { extraPatches = [ ./clang-4.8.patch ]; sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0"; branch = "4.8"; - drvArgs.hardeningDisable = [ "format" ]; - - # https://community.oracle.com/thread/3952592 - # this patch renames some sybols that conflict with libc++-3.8 - # symbols: atomic_compare_exchange, atomic_init, store - drvArgs.prePatch = '' - substituteInPlace dbinc/db.in \ - --replace '#define store' '#define store_db' - - substituteInPlace dbinc/atomic.h \ - --replace atomic_compare_exchange atomic_compare_exchange_db \ - --replace atomic_init atomic_init_db - substituteInPlace mp/*.c \ - --replace atomic_compare_exchange atomic_compare_exchange_db \ - --replace atomic_init atomic_init_db - substituteInPlace mutex/*.c \ - --replace atomic_compare_exchange atomic_compare_exchange_db \ - --replace atomic_init atomic_init_db - ''; + drvArgs = { hardeningDisable = [ "format" ]; }; }) |