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

systemd: fix build

Browse Source 
meson 0.46 no longer likes receiving both -Dmandir and --mandir. I removed the flags from the expression in favour of those in the meson setup hook. This also fixes manpages which were previously
installed to $man/lib for some reason.
This commit is contained in:
Jan Tojnar 2018-05-22 20:59:04 +02:00
parent 405cb86037
commit cd1fb3babf
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/os-specific/linux/systemd/default.nix
View File

@ -101,20 +101,10 @@ in stdenv.mkDerivation rec {
mesonFlagsArray+=(-Ddbussystemservicedir=$out/share/dbus-1/system-services)
mesonFlagsArray+=(-Dpamconfdir=$out/etc/pam.d)
mesonFlagsArray+=(-Drootprefix=$out)
mesonFlagsArray+=(-Dlibdir=$lib/lib)
mesonFlagsArray+=(-Drootlibdir=$lib/lib)
mesonFlagsArray+=(-Dmandir=$man/lib)
mesonFlagsArray+=(-Dincludedir=$dev/include)
mesonFlagsArray+=(-Dpkgconfiglibdir=$dev/lib/pkgconfig)
mesonFlagsArray+=(-Dpkgconfigdatadir=$dev/share/pkgconfig)
# FIXME: Why aren't includedir and libdir picked up from mesonFlags while other options are?
substituteInPlace meson.build \
--replace "includedir = join_paths(prefixdir, get_option('includedir'))" \
"includedir = '$dev/include'" \
--replace "libdir = join_paths(prefixdir, get_option('libdir'))" \
"libdir = '$lib/lib'"
export LC_ALL="en_US.UTF-8";
# FIXME: patch this in systemd properly (and send upstream).
# already fixed in f00929ad622c978f8ad83590a15a765b4beecac9: (u)mount