From 21df40f85fd3c59cb90a6a44f05c3d4d29daeffa Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Mon, 15 Aug 2016 12:41:45 +0200 Subject: [PATCH] systemd-cryptsetup-generator: Fix bug. The annoying wrapper script also wraps `systemd-cryptsetup`. We need to copy the original binary to $out too. --- pkgs/os-specific/linux/systemd/cryptsetup-generator.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix index 3d617ece1c0084..dc0a23be98fea8 100644 --- a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix +++ b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix @@ -18,10 +18,10 @@ stdenv.lib.overrideDerivation systemd (p: { # For some reason systemd-cryptsetup-generator is a wrapper-script # with the current release of systemd. We want the real one. - # TODO: Revert 3efadce when the wrapper-script is gone + # TODO: Remove `.libs` prefix when the wrapper-script is gone installPhase = '' mkdir -p $out/lib/systemd/ - cp systemd-cryptsetup $out/lib/systemd/systemd-cryptsetup + cp .libs/systemd-cryptsetup $out/lib/systemd/systemd-cryptsetup cp .libs/*.so $out/lib/ mkdir -p $out/lib/systemd/system-generators/