diff options
author | Robin Gloster <mail@glob.in> | 2017-08-11 11:40:08 +0200 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2017-08-11 11:40:36 +0200 |
commit | 28cc2642f09419b0a8345d6349329b851d11ad98 (patch) | |
tree | 4b107b35809712540a0962b53dc2f75dfd2fdda0 /pkgs/os-specific/linux/iputils | |
parent | 72457cdebbeeafbc48cba517f07351ff02cc0dab (diff) | |
download | nixpkgs-28cc2642f09419b0a8345d6349329b851d11ad98.tar nixpkgs-28cc2642f09419b0a8345d6349329b851d11ad98.tar.gz nixpkgs-28cc2642f09419b0a8345d6349329b851d11ad98.tar.bz2 nixpkgs-28cc2642f09419b0a8345d6349329b851d11ad98.tar.lz nixpkgs-28cc2642f09419b0a8345d6349329b851d11ad98.tar.xz nixpkgs-28cc2642f09419b0a8345d6349329b851d11ad98.tar.zst nixpkgs-28cc2642f09419b0a8345d6349329b851d11ad98.zip |
treewide: use less `phases` if not necessary
This removes some skipping of e.g. fixupPhase and cleans up occurences where this led to duplicating code
Diffstat (limited to 'pkgs/os-specific/linux/iputils')
-rw-r--r-- | pkgs/os-specific/linux/iputils/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 1b6be8e4aa1..dd5770744bf 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , libsysfs, gnutls, openssl -, libcap, sp, docbook_sgml_dtd_31 +, libcap, opensp, docbook_sgml_dtd_31 , libidn, nettle , SGMLSpm, libgcrypt }: @@ -18,13 +18,15 @@ stdenv.mkDerivation rec { }; prePatch = '' - sed -i s/sgmlspl/sgmlspl.pl/ doc/Makefile + sed -e s/sgmlspl/sgmlspl.pl/ \ + -e s/nsgmls/onsgmls/ \ + -i doc/Makefile ''; makeFlags = "USE_GNUTLS=no"; buildInputs = [ - libsysfs openssl libcap sp docbook_sgml_dtd_31 SGMLSpm libgcrypt libidn nettle + libsysfs opensp openssl libcap docbook_sgml_dtd_31 SGMLSpm libgcrypt libidn nettle ]; buildFlags = "man all ninfod"; |