Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 405cb8603724
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cd1fb3babf42
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on May 22, 2018

  1. 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.
    @jtojnar
    jtojnar committed May 22, 2018
    Copy the full SHA
    cd1fb3b View commit details
Showing with 0 additions and 10 deletions.
  1. +0 −10 pkgs/os-specific/linux/systemd/default.nix
10 changes: 0 additions & 10 deletions pkgs/os-specific/linux/systemd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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