From b67c061f0a41fde700fa66c678ef9e655dba75b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 11 Dec 2018 23:16:42 +0000 Subject: [PATCH] tdb: fix cross-compilation --- pkgs/development/libraries/tdb/default.nix | 26 +++++++++++++--------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index f6e4a047282..d2ff7c5efd3 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, python, pkgconfig, readline, libxslt -, docbook_xsl, docbook_xml_dtd_42 +{ stdenv, fetchurl, python2, pkgconfig, readline, libxslt +, docbook_xsl, docbook_xml_dtd_42, buildPackages }: stdenv.mkDerivation rec { @@ -10,28 +10,32 @@ stdenv.mkDerivation rec { sha256 = "1ibcz466xwk1x6xvzlgzd5va4lyrjzm3rnjak29kkwk7cmhw4gva"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig python2 ]; buildInputs = [ - python readline libxslt docbook_xsl docbook_xml_dtd_42 + readline libxslt docbook_xsl docbook_xml_dtd_42 ]; preConfigure = '' - sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,g' buildtools/bin/waf + patchShebangs 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"; - longDescription = - '' TDB is a Trivial Database. In concept, it is very much like GDBM, - and BSD's DB except that it allows multiple simultaneous writers and - uses locking internally to keep writers from trampling on each - other. TDB is also extremely small. - ''; + longDescription = '' + TDB is a Trivial Database. In concept, it is very much like GDBM, + and BSD's DB except that it allows multiple simultaneous writers + and uses locking internally to keep writers from trampling on each + other. TDB is also extremely small. + ''; homepage = https://tdb.samba.org/; license = licenses.lgpl3Plus; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5191f9683a3..0d6b2cf3194 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12588,9 +12588,7 @@ in python = python2; }; - tdb = callPackage ../development/libraries/tdb { - python = python2; - }; + tdb = callPackage ../development/libraries/tdb {}; tecla = callPackage ../development/libraries/tecla { };