Unverified Commit eb4b6ca2 authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #215839 from Artturin/teventcrossfix

parents 3b7b2807 0d4a49af

pkgs/development/libraries/ldb/default.nix

+4 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
, docbook_xml_dtd_42

, cmocka

, wafHook

, libxcrypt

}:



stdenv.mkDerivation rec {
@@ -32,6 +33,8 @@ stdenv.mkDerivation rec { 
    libxslt

    docbook-xsl-nons

    docbook_xml_dtd_42

    tdb

    tevent

  ];



  buildInputs = [
@@ -42,6 +45,7 @@ stdenv.mkDerivation rec { 
    tevent

    popt

    cmocka

    libxcrypt

  ];



  # otherwise the configure script fails with

pkgs/development/libraries/tevent/default.nix

+7 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
, docbook_xml_dtd_42

, which

, wafHook

, libxcrypt

}:



stdenv.mkDerivation rec {
@@ -36,6 +37,7 @@ stdenv.mkDerivation rec { 
    cmocka

    readline # required to build python

    talloc

    libxcrypt

  ];



  # otherwise the configure script fails with
@@ -52,6 +54,11 @@ stdenv.mkDerivation rec { 
    "--builtin-libraries=replace"

  ];



  # python-config from build Python gives incorrect values when cross-compiling.

  # If python-config is not found, the build falls back to using the sysconfig

  # module, which works correctly in all cases.

  PYTHON_CONFIG = "/invalid";



  meta = with lib; {

    description = "An event system based on the talloc memory management library";

    homepage = "https://tevent.samba.org/";