diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-03-28 17:15:41 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-03-28 18:37:29 -0700 |
| commit | 4868649f037c4fe80034f281212b8ccd2d0ac148 (patch) | |
| tree | bd56e8aef16495981a03e8c41e300d0ee03bed02 /nixos/modules/system/boot/luksroot.nix | |
| parent | b1e854d660b03cc3f7f25dce44e673b9e5bcaf32 (diff) | |
| download | nixpkgs-4868649f037c4fe80034f281212b8ccd2d0ac148.tar nixpkgs-4868649f037c4fe80034f281212b8ccd2d0ac148.tar.gz nixpkgs-4868649f037c4fe80034f281212b8ccd2d0ac148.tar.bz2 nixpkgs-4868649f037c4fe80034f281212b8ccd2d0ac148.tar.lz nixpkgs-4868649f037c4fe80034f281212b8ccd2d0ac148.tar.xz nixpkgs-4868649f037c4fe80034f281212b8ccd2d0ac148.tar.zst nixpkgs-4868649f037c4fe80034f281212b8ccd2d0ac148.zip | |
nixos/initrd: Generic library copying
Diffstat (limited to 'nixos/modules/system/boot/luksroot.nix')
| -rw-r--r-- | nixos/modules/system/boot/luksroot.nix | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index da5bb8fe066..20eee8e06e0 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -405,29 +405,19 @@ in # copy the cryptsetup binary and it's dependencies boot.initrd.extraUtilsCommands = '' - cp -pdv ${pkgs.cryptsetup}/sbin/cryptsetup $out/bin - - cp -pdv ${pkgs.libgcrypt_1_6}/lib/libgcrypt*.so.* $out/lib - cp -pdv ${pkgs.libgpgerror}/lib/libgpg-error*.so.* $out/lib - cp -pdv ${pkgs.cryptsetup}/lib/libcryptsetup*.so.* $out/lib - cp -pdv ${pkgs.popt}/lib/libpopt*.so.* $out/lib + copy_bin_and_libs ${pkgs.cryptsetup}/bin/cryptsetup ${optionalString luks.yubikeySupport '' - cp -pdv ${pkgs.ykpers}/bin/ykchalresp $out/bin - cp -pdv ${pkgs.ykpers}/bin/ykinfo $out/bin - cp -pdv ${pkgs.openssl}/bin/openssl $out/bin - - cc -O3 -I${pkgs.openssl}/include -L${pkgs.openssl}/lib ${./pbkdf2-sha512.c} -o $out/bin/pbkdf2-sha512 -lcrypto - strip -s $out/bin/pbkdf2-sha512 + copy_bin_and_libs ${pkgs.ykpers}/bin/ykchalresp + copy_bin_and_libs ${pkgs.ykpers}/bin/ykinfo + copy_bin_and_libs ${pkgs.openssl}/bin/openssl - cp -pdv ${pkgs.libusb1}/lib/libusb*.so.* $out/lib - cp -pdv ${pkgs.ykpers}/lib/libykpers*.so.* $out/lib - cp -pdv ${pkgs.libyubikey}/lib/libyubikey*.so.* $out/lib - cp -pdv ${pkgs.openssl}/lib/libssl*.so.* $out/lib - cp -pdv ${pkgs.openssl}/lib/libcrypto*.so.* $out/lib + cc -O3 -I${pkgs.openssl}/include -L${pkgs.openssl}/lib ${./pbkdf2-sha512.c} -o pbkdf2-sha512 -lcrypto + strip -s pbkdf2-sha512 + copy_bin_and_libs pbkdf2-sha512 - mkdir -p $out/etc/ssl - cp -pdv ${pkgs.openssl}/etc/ssl/openssl.cnf $out/etc/ssl + mkdir -p $out/etc/ssl + cp -pdv ${pkgs.openssl}/etc/ssl/openssl.cnf $out/etc/ssl cat > $out/bin/openssl-wrap <<EOF #!$out/bin/sh |