public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iputils: apply proposed upstream patch to get rid of systemd dependency

Browse Source 
This allows us to get rid of the hack and the systemd dependency and
thus reduces the rebuild closure whenever systemd changes.
This commit is contained in:
Andreas Rammhold
2020-10-19 22:04:52 +02:00
parent 54e6cfc1ef
commit 0a55c5dada
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/iputils/default.nix
+9 -6
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub { stdenv, fetchFromGitHub, fetchpatch
, meson, ninja, pkgconfig, gettext, libxslt, docbook_xsl_ns , meson, ninja, pkgconfig, gettext, libxslt, docbook_xsl_ns
, libcap, libidn2 , libcap, libidn2
}: }:
@@ -22,11 +22,13 @@ in stdenv.mkDerivation rec {
sha256 = "1jhbcz75a4ij1myyyi110ma1d8d5hpm3scz9pyw7js6qym50xvh4"; sha256 = "1jhbcz75a4ij1myyyi110ma1d8d5hpm3scz9pyw7js6qym50xvh4";
}; };
postPatch = '' patches = [
# Enable the systemd units even without systemd being an input. We set the # Proposed upstream patch to reduce dependency on systemd: https://github.com/iputils/iputils/pull/297
# unitdir manually anyway. (fetchpatch {
sed -e 's/systemd\.found()/true/g' -i meson.build url = "https://github.com/iputils/iputils/commit/13d6aefd57fd471ecad06e19073dcc44608dff5e.patch";
''; sha256 = "1n62zxmzp7hgz9qapbbpqv3fxqvc3qyd2a73jhp357x6by84kj49";
})
];
mesonFlags = [ mesonFlags = [
"-DBUILD_RARPD=true" "-DBUILD_RARPD=true"
@@ -34,6 +36,7 @@ in stdenv.mkDerivation rec {
"-DBUILD_TFTPD=true" "-DBUILD_TFTPD=true"
"-DNO_SETCAP_OR_SUID=true" "-DNO_SETCAP_OR_SUID=true"
"-Dsystemdunitdir=etc/systemd/system" "-Dsystemdunitdir=etc/systemd/system"
"-DINSTALL_SYSTEMD_UNITS=true"
] ]
# Disable idn usage w/musl (https://github.com/iputils/iputils/pull/111): # Disable idn usage w/musl (https://github.com/iputils/iputils/pull/111):
++ optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false"; ++ optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false";