systemd-cryptsetup-generator: fix compilation with systemd 237

Closes #35097
NixOS · Feb 20, 2018 · d351cd9 · d351cd9
1 parent f8b5b93
commit d351cd9
Showing 1 changed file with 4 additions and 10 deletions.
diff --git 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
   '';
 })