diff options
| author | Tristan Ross <tristan.ross@midstall.com> | 2024-06-23 20:01:37 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-23 20:01:37 -0700 |
| commit | 09970d497ebbdaef1c662cad561725f2ea2c736b (patch) | |
| tree | df8253764e6fd901499e894ca04e3a36a8f798ad /pkgs/development | |
| parent | 920bd704b7dcdec72f5ebd04138f712bf8d7302f (diff) | |
| parent | 227afde6d8eeb9c08b4f9bb3c42521925e2977a5 (diff) | |
Merge pull request #320187 from ExpidusOS/fix/pkgsllvm/db
db4: fix configure with llvm
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/db/db-4.8.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/db/generic.nix | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/development/libraries/db/db-4.8.nix b/pkgs/development/libraries/db/db-4.8.nix index 81705374381e7..4d6029d6d8211 100644 --- a/pkgs/development/libraries/db/db-4.8.nix +++ b/pkgs/development/libraries/db/db-4.8.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl, autoreconfHook, ... } @ args: +{ lib, stdenv, fetchurl, autoreconfHook, targetPlatform, ... } @ args: -import ./generic.nix (args // { +import ./generic.nix (builtins.removeAttrs args ["targetPlatform"] // { version = "4.8.30"; sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0"; extraPatches = [ @@ -9,6 +9,8 @@ import ./generic.nix (args // { ./darwin-mutexes-4.8.patch ]; + drvArgs.configureFlags = lib.optional (targetPlatform.useLLVM or false) "--with-mutex=POSIX/pthreads"; + drvArgs.hardeningDisable = [ "format" ]; drvArgs.doCheck = false; }) diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix index d715c1ffc8b19..ddb4139e116d1 100644 --- a/pkgs/development/libraries/db/generic.nix +++ b/pkgs/development/libraries/db/generic.nix @@ -67,7 +67,8 @@ stdenv.mkDerivation (rec { (if compat185 then "--enable-compat185" else "--disable-compat185") ] ++ lib.optional dbmSupport "--enable-dbm" - ++ lib.optional stdenv.isFreeBSD "--with-pic"; + ++ lib.optional stdenv.isFreeBSD "--with-pic" + ++ (drvArgs.configureFlags or []); preConfigure = '' cd build_unix @@ -92,4 +93,4 @@ stdenv.mkDerivation (rec { license = license; platforms = platforms.unix; }; -} // drvArgs) +} // builtins.removeAttrs drvArgs [ "configureFlags" ]) |