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-16 07:54:01 +00:00
parent 1747d28e5a 888efed972
commit 33e1c78ae3
139 changed files with 1301 additions and 1116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/systemd/cryptsetup-generator.nix
+2 -2
View File
@@ -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/