diff options
| author | Matthew Bauer <matthew.bauer@obsidian.systems> | 2018-07-17 16:11:16 -0400 |
|---|---|---|
| committer | Matthew Bauer <matthew.bauer@obsidian.systems> | 2018-07-18 23:25:20 -0400 |
| commit | 76999cc40e6c4cbfe817b3b6f125ece999ae9b73 (patch) | |
| tree | 0325a27e51eb7bed006c1ef958e6312ac1d995c4 /pkgs/os-specific/linux/iputils | |
| parent | d7d31fea7e7eef8ff4495e75be5dcbb37fb215d0 (diff) | |
| download | nixlib-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar nixlib-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.gz nixlib-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.bz2 nixlib-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.lz nixlib-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.xz nixlib-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.tar.zst nixlib-76999cc40e6c4cbfe817b3b6f125ece999ae9b73.zip | |
treewide: remove aliases in nixpkgs
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.
Misc...
- qtikz: use libsForQt5.callPackage
This ensures we get the right poppler.
- rewrites:
docbook5_xsl -> docbook_xsl_ns
docbook_xml_xslt -> docbook_xsl
diffpdf: fixup
Diffstat (limited to 'pkgs/os-specific/linux/iputils')
| -rw-r--r-- | pkgs/os-specific/linux/iputils/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index d2eab02f6753..d0a8950a5087 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, libsysfs, gnutls, openssl +, sysfsutils, gnutls, openssl , libcap, opensp, docbook_sgml_dtd_31 , libidn, nettle , SGMLSpm, libgcrypt }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ opensp SGMLSpm docbook_sgml_dtd_31 ]; buildInputs = [ - libsysfs openssl libcap libgcrypt nettle + sysfsutils openssl libcap libgcrypt nettle ] ++ stdenv.lib.optional (!stdenv.hostPlatform.isMusl) libidn; # ninfod probably could build on cross, but the Makefile doesn't pass --host etc to the sub configure... |