diff options
| author | Guillaume Girol <symphorien@users.noreply.github.com> | 2022-02-16 21:04:01 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-16 21:04:01 +0000 |
| commit | 8481553b61b29023c5f307c0ff7f2f8646907fa5 (patch) | |
| tree | 72b1116622fa5c7b76699c270843a0cc0b95cba6 /pkgs/top-level | |
| parent | fa69e31bb0237af3c857da642cc2812be666aa65 (diff) | |
| parent | bc0839b3d6e286926459f2e56cddd4b953b799bf (diff) | |
Merge pull request #151823 from Mindavi/apr-util/eval
aprutil: fix evaluation, support cross-compilation
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aff871b2ff929..b08ca10b2d4f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15898,11 +15898,7 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - aprutil = callPackage ../development/libraries/apr-util { - db = if stdenv.isFreeBSD then db4 else db; - # XXX: only the db_185 interface was available through - # apr with db58 on freebsd (nov 2015), for unknown reasons - }; + aprutil = callPackage ../development/libraries/apr-util { }; aravis = callPackage ../development/libraries/aravis { inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad; |