diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-03-31 04:28:43 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-03-31 04:51:58 +0200 |
| commit | 2ef17b38fbc7a6845567def91204bfa64091f762 (patch) | |
| tree | 970c67f74124265ffc662853cfd6134819aaeda2 /pkgs/development/libraries/tevent | |
| parent | f6f09daa23ad872c7d0a1704d6922c56cfc479dc (diff) | |
tevent: 0.9.37 → 0.10.2
* Now requires Python 3
* Which was also coincidentally required to fix build (https://github.com/NixOS/nixpkgs/issues/82489)
* Also switch to wafhook
Changes:
* https://git.samba.org/samba.git/?p=samba.git;a=commit;h=1c73f38633ce40bcf19775fbeaf5e3baacdba9ab
* https://git.samba.org/samba.git/?p=samba.git;a=commit;h=db58a50296041ca57675daee15caea8850f1d3f8
* https://git.samba.org/samba.git/?p=samba.git;a=commit;h=6f2278018436184785e19f69efc60ec408b14aa7
* https://git.samba.org/samba.git/?p=samba.git;a=commit;h=123267138e993c6a87990c0022e89f4970c0ac12
* https://git.samba.org/samba.git/?p=samba.git;a=commit;h=4aea5c0972de53c143530cc42ef6d3b8cfafb973
Diffstat (limited to 'pkgs/development/libraries/tevent')
| -rw-r--r-- | pkgs/development/libraries/tevent/default.nix | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index b3c31ffd88d2..66d65e639510 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -1,41 +1,44 @@ { stdenv , fetchurl -, python +, python3 , pkg-config , readline , talloc , libxslt , docbook-xsl-nons , docbook_xml_dtd_42 +, which +, wafHook }: stdenv.mkDerivation rec { pname = "tevent"; - version = "0.9.37"; + version = "0.10.2"; src = fetchurl { url = "mirror://samba/tevent/${pname}-${version}.tar.gz"; - sha256 = "1q77vbjic2bb79li2a54ffscnrnwwww55fbpry2kgh7acpnlb0qn"; + sha256 = "+EJ4IuWyh4+4so1vUNloSHNPPzEwYS+1dP3S0hSKZpY="; }; nativeBuildInputs = [ pkg-config + which + python3 + libxslt + docbook-xsl-nons + docbook_xml_dtd_42 + wafHook ]; buildInputs = [ - python - readline + python3 + readline # required to build python talloc - libxslt - docbook-xsl-nons - docbook_xml_dtd_42 ]; - preConfigure = '' - sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,g' buildtools/bin/waf - ''; + wafPath = "buildtools/bin/waf"; - configureFlags = [ + wafConfigureFlags = [ "--bundled-libraries=NONE" "--builtin-libraries=replace" ]; |