diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-02-01 20:46:16 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-02-01 20:46:16 +0200 |
| commit | 13b3f3f246fdb8dfc854c5283aa1dc88d1e774d1 (patch) | |
| tree | 6e325b0bf4729b5f7ba350428745ffd550dcf33d /nixos/modules | |
| parent | 3cc7fa0be91ba9ac4dd9b96c551de79220b27704 (diff) | |
| download | nixpkgs-13b3f3f246fdb8dfc854c5283aa1dc88d1e774d1.tar nixpkgs-13b3f3f246fdb8dfc854c5283aa1dc88d1e774d1.tar.gz nixpkgs-13b3f3f246fdb8dfc854c5283aa1dc88d1e774d1.tar.bz2 nixpkgs-13b3f3f246fdb8dfc854c5283aa1dc88d1e774d1.tar.lz nixpkgs-13b3f3f246fdb8dfc854c5283aa1dc88d1e774d1.tar.xz nixpkgs-13b3f3f246fdb8dfc854c5283aa1dc88d1e774d1.tar.zst nixpkgs-13b3f3f246fdb8dfc854c5283aa1dc88d1e774d1.zip | |
treewide: Mass replace 'openssl}/bin' to refer the 'bin' output
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/web-servers/apache-httpd/owncloud.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/system/boot/luksroot.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix index 9994de0f9b4..5633f30e4a8 100644 --- a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix +++ b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix @@ -333,7 +333,7 @@ let 'version' => '${config.package.version}', - 'openssl' => '${pkgs.openssl}/bin/openssl' + 'openssl' => '${pkgs.openssl.bin}/bin/openssl' ); diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 6ea11e60b26..77a82547031 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -436,7 +436,7 @@ in ${optionalString luks.yubikeySupport '' copy_bin_and_libs ${pkgs.ykpers}/bin/ykchalresp copy_bin_and_libs ${pkgs.ykpers}/bin/ykinfo - copy_bin_and_libs ${pkgs.openssl}/bin/openssl + copy_bin_and_libs ${pkgs.openssl.bin}/bin/openssl cc -O3 -I${pkgs.openssl}/include -L${pkgs.openssl.out}/lib ${./pbkdf2-sha512.c} -o pbkdf2-sha512 -lcrypto strip -s pbkdf2-sha512 |