diff options
| author | Robin Gloster <mail@glob.in> | 2016-08-12 09:46:53 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-08-12 09:46:53 +0000 |
| commit | b7787d932ec9cbd82ea6bc7c69d8df159b606fdc (patch) | |
| tree | c4b6af2e6b49732ce5c6982cb8512ce9b7f1f34d /nixos/modules/system/boot/luksroot.nix | |
| parent | bc025e83bd6c44df38851ef23da53359a0e62841 (diff) | |
| parent | 532b2222965377e77ed884c463ee2751fb51dba3 (diff) | |
| download | nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.gz nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.bz2 nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.lz nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.xz nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.zst nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'nixos/modules/system/boot/luksroot.nix')
| -rw-r--r-- | nixos/modules/system/boot/luksroot.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 8dad09c89207..f2755b49f88d 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -443,7 +443,7 @@ in copy_bin_and_libs pbkdf2-sha512 mkdir -p $out/etc/ssl - cp -pdv ${pkgs.openssl}/etc/ssl/openssl.cnf $out/etc/ssl + cp -pdv ${pkgs.openssl.out}/etc/ssl/openssl.cnf $out/etc/ssl cat > $out/bin/openssl-wrap <<EOF #!$out/bin/sh |