diff options
author | Symphorien Gibol <symphorien+git@xlumurb.eu> | 2019-03-28 20:15:55 +0100 |
---|---|---|
committer | Symphorien Gibol <symphorien+git@xlumurb.eu> | 2019-03-28 20:15:55 +0100 |
commit | cbd94090867cf2af7bd8e8b3dc5bc2233906885a (patch) | |
tree | a5ece8f06ca758f7293ed8191e66e50534ee9a32 /pkgs/development/libraries/tdb | |
parent | 3d60a00c63705e2e2d6e98e72a42dd1928eac746 (diff) |
talloc, tdb: fix cross-compilation after wafHook improvements
Diffstat (limited to 'pkgs/development/libraries/tdb')
-rw-r--r-- | pkgs/development/libraries/tdb/default.nix | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index 21f062998b400..e1e91be7373a7 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, python2, pkgconfig, readline, libxslt -, docbook_xsl, docbook_xml_dtd_42, buildPackages +{ stdenv, fetchurl, wafHook, pkgconfig, readline, libxslt +, docbook_xsl, docbook_xml_dtd_42 }: stdenv.mkDerivation rec { @@ -10,23 +10,17 @@ stdenv.mkDerivation rec { sha256 = "1ibcz466xwk1x6xvzlgzd5va4lyrjzm3rnjak29kkwk7cmhw4gva"; }; - nativeBuildInputs = [ pkgconfig python2 ]; + nativeBuildInputs = [ pkgconfig wafHook ]; buildInputs = [ readline libxslt docbook_xsl docbook_xml_dtd_42 ]; - preConfigure = '' - patchShebangs buildtools/bin/waf - ''; + wafPath = "buildtools/bin/waf"; configureFlags = [ "--bundled-libraries=NONE" "--builtin-libraries=replace" - ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "--cross-compile" - "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}" ]; - configurePlatforms = [ ]; meta = with stdenv.lib; { description = "The trivial database"; |