From cd1fb3babf420a8f85f07beb61a9769f38adfa24 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 22 May 2018 20:59:04 +0200 Subject: systemd: fix build 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. --- pkgs/os-specific/linux/systemd/default.nix | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'pkgs/os-specific/linux/systemd') diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 89bd123d938..307ba9f43fa 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -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 -- cgit 1.4.1