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
This commit is contained in:
Robin Gloster
2017-08-11 11:40:36 +02:00
parent 72457cdebb
commit 28cc2642f0
16 changed files with 43 additions and 74 deletions
+5 -3
View File
@@ -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";