diff options
| author | Pascal Bach <pascal.bach@nextrem.ch> | 2018-02-20 12:06:55 +0100 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-02-20 16:34:30 +0200 |
| commit | d351cd9f6959646d9b52abf014360b7a6e8c958d (patch) | |
| tree | 3d2c9fdf5b96211e1a2ce30bcef8d32736879cba | |
| parent | f8b5b93b8871a1fc3bbcea92cab7a13d2f02e1bb (diff) | |
systemd-cryptsetup-generator: fix compilation with systemd 237
Closes #35097
| -rw-r--r-- | pkgs/os-specific/linux/systemd/cryptsetup-generator.nix | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix index dc0a23be98fea..f69269347e373 100644 --- a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix +++ b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix @@ -10,21 +10,15 @@ stdenv.lib.overrideDerivation systemd (p: { outputs = [ "out" ]; buildPhase = '' - make $makeFlags built-sources - make $makeFlags systemd-cryptsetup - make $makeFlags systemd-cryptsetup-generator + ninja systemd-cryptsetup systemd-cryptsetup-generator ''; - # For some reason systemd-cryptsetup-generator is a wrapper-script - # with the current release of systemd. We want the real one. - - # TODO: Remove `.libs` prefix when the wrapper-script is gone installPhase = '' mkdir -p $out/lib/systemd/ - cp .libs/systemd-cryptsetup $out/lib/systemd/systemd-cryptsetup - cp .libs/*.so $out/lib/ + cp systemd-cryptsetup $out/lib/systemd/systemd-cryptsetup + cp src/shared/*.so $out/lib/systemd/ mkdir -p $out/lib/systemd/system-generators/ - cp .libs/systemd-cryptsetup-generator $out/lib/systemd/system-generators/systemd-cryptsetup-generator + cp systemd-cryptsetup-generator $out/lib/systemd/system-generators/systemd-cryptsetup-generator ''; }) |