public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

Browse Source
This commit is contained in:
Robin Gloster
2016-08-12 09:46:53 +00:00
parent bc025e83bd 532b222296
commit b7787d932e
372 changed files with 7520 additions and 3777 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/os-specific/linux/systemd/cryptsetup-generator.nix
View File

@@ -15,11 +15,16 @@ stdenv.lib.overrideDerivation systemd (p: {
make $makeFlags 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: Revert 3efadce when the wrapper-script is gone
installPhase = ''
mkdir -p $out/lib/systemd/
cp systemd-cryptsetup $out/lib/systemd/systemd-cryptsetup
cp .libs/*.so $out/lib/
mkdir -p $out/lib/systemd/system-generators/
cp systemd-cryptsetup-generator $out/lib/systemd/system-generators/systemd-cryptsetup-generator
cp .libs/systemd-cryptsetup-generator $out/lib/systemd/system-generators/systemd-cryptsetup-generator
'';
})