commit 21df40f85fd3c59cb90a6a44f05c3d4d29daeffa

pyrox.dev / nixpkgs

lol

fork atom

systemd-cryptsetup-generator: Fix bug.

The annoying wrapper script also wraps `systemd-cryptsetup`. We need to
copy the original binary to $out too.

moritz.vongoewels.de 9 years ago 21df40f8 b22fc4c4

+2 -2

1 changed file

expand all

unified split

pkgs

os-specific

linux

systemd

cryptsetup-generator.nix

+2 -2

pkgs/os-specific/linux/systemd/cryptsetup-generator.nix

··· 18 # For some reason systemd-cryptsetup-generator is a wrapper-script 19 # with the current release of systemd. We want the real one. 20 21 - # TODO: Revert 3efadce when the wrapper-script is gone 22 installPhase = '' 23 mkdir -p $out/lib/systemd/ 24 - cp systemd-cryptsetup $out/lib/systemd/systemd-cryptsetup 25 cp .libs/*.so $out/lib/ 26 27 mkdir -p $out/lib/systemd/system-generators/

··· 18 # For some reason systemd-cryptsetup-generator is a wrapper-script 19 # with the current release of systemd. We want the real one. 20 21 + # TODO: Remove `.libs` prefix when the wrapper-script is gone 22 installPhase = '' 23 mkdir -p $out/lib/systemd/ 24 + cp .libs/systemd-cryptsetup $out/lib/systemd/systemd-cryptsetup 25 cp .libs/*.so $out/lib/ 26 27 mkdir -p $out/lib/systemd/system-generators/