git.iko.soy/typeable/nixpkgs
on master help sign in
ntdb: clean up expression

* format with nixpkgs-fmt * quote homepage as per RFC 0045 * split name → pname & version * do not use aliases * switch to wafHook * move build tools to nativeBuildInputs

commit1be7664496efff14ff61459e339145b738d57e94 authorJan Tojnar <jtojnar@gmail.com> dateTue 31 Mar 2020, 05:17 (7 years ago) parent4cfdc7a
2 files changed+28−14
pkgs/development/libraries/ntdb/default.nix+27−11 pkgs/top-level/all-packages.nix+1−3
pkgs/development/libraries/ntdb/default.nix+27−11
@@ -1,32 +1,48 @@
1−{ stdenv, fetchurl, python, pkgconfig, readline, gettext, libxslt
2−, docbook_xsl, docbook_xml_dtd_42
1+{ stdenv
2+, fetchurl
3+, python3
4+, pkg-config
5+, readline
6+, gettext
7+, libxslt
8+, docbook-xsl-nons
9+, docbook_xml_dtd_42
10+, wafHook
311}:
412
513stdenv.mkDerivation rec {
6− name = "ntdb-1.0";
14+ pname = "ntdb";
15+ version = "1.0";
716
817 src = fetchurl {
9− url = "mirror://samba/tdb/${name}.tar.gz";
18+ url = "mirror://samba/tdb/${pname}-${version}.tar.gz";
1019 sha256 = "0jdzgrz5sr25k83yrw7wqb3r0yj1v04z4s3lhsmnr5z6n5ifhyl1";
1120 };
1221
13− nativeBuildInputs = [ pkgconfig ];
22+ nativeBuildInputs = [
23+ pkg-config
24+ gettext
25+ libxslt
26+ docbook-xsl-nons
27+ docbook_xml_dtd_42
28+ wafHook
29+ ];
30+
1431 buildInputs = [
15− python readline gettext libxslt docbook_xsl docbook_xml_dtd_42
32+ python3
33+ readline # required to build python
1634 ];
1735
18− preConfigure = ''
19− patchShebangs buildtools/bin/waf
20− '';
36+ wafPath = "buildtools/bin/waf";
2137
22− configureFlags = [
38+ wafConfigureFlags = [
2339 "--bundled-libraries=NONE"
2440 "--builtin-libraries=replace,ccan"
2541 ];
2642
2743 meta = with stdenv.lib; {
2844 description = "The not-so trivial database";
29− homepage = https://tdb.samba.org/;
45+ homepage = "https://tdb.samba.org/";
3046 license = licenses.lgpl3Plus;
3147 platforms = platforms.all;
3248 };
pkgs/top-level/all-packages.nix+1−3
@@ -14627,9 +14627,7 @@ in
1462714627
1462814628 tclx = callPackage ../development/libraries/tclx { };
1462914629
14630− ntdb = callPackage ../development/libraries/ntdb {
14631− python = python2;
14632− };
14630+ ntdb = callPackage ../development/libraries/ntdb { };
1463314631
1463414632 tdb = callPackage ../development/libraries/tdb {};
1463514633