diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-09-01 17:37:53 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-09-01 17:38:18 +0200 |
| commit | 2d6179d1e8c15d341f0cade0ab55653623eb5038 (patch) | |
| tree | d69260a6e740c174c9616b2bb6d24a0e98ba8f6e /pkgs/tools/security/encryptr/default.nix | |
| parent | 2e7cb61cfbe6df23a2e223f98ae61e1a385ea747 (diff) | |
| parent | 9a56eee0b144c1e63afc0b5c9e562da9565ea7f0 (diff) | |
| download | nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.tar nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.tar.gz nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.tar.bz2 nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.tar.lz nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.tar.xz nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.tar.zst nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.zip | |
Merge branch 'master' into staging
A few trivial conflicts due to *Platforms mass replace.
Diffstat (limited to 'pkgs/tools/security/encryptr/default.nix')
| -rw-r--r-- | pkgs/tools/security/encryptr/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/security/encryptr/default.nix b/pkgs/tools/security/encryptr/default.nix index 2cf07c63a84a..8d0c78764319 100644 --- a/pkgs/tools/security/encryptr/default.nix +++ b/pkgs/tools/security/encryptr/default.nix @@ -5,13 +5,13 @@ }: let - arch = if stdenv.system == "x86_64-linux" then "amd" - else if stdenv.system == "i686-linux" then "i386" - else throw "Encryptr for ${stdenv.system} not supported!"; + arch = if stdenv.hostPlatform.system == "x86_64-linux" then "amd" + else if stdenv.hostPlatform.system == "i686-linux" then "i386" + else throw "Encryptr for ${stdenv.hostPlatform.system} not supported!"; - sha256 = if stdenv.system == "x86_64-linux" then "1j3g467g7ar86hpnh6q9mf7mh2h4ia94mwhk1283zh739s2g53q2" - else if stdenv.system == "i686-linux" then "02j9hg9b1jlv25q1sjfhv8d46mii33f94dj0ccn83z9z18q4y2cm" - else throw "Encryptr for ${stdenv.system} not supported!"; + sha256 = if stdenv.hostPlatform.system == "x86_64-linux" then "1j3g467g7ar86hpnh6q9mf7mh2h4ia94mwhk1283zh739s2g53q2" + else if stdenv.hostPlatform.system == "i686-linux" then "02j9hg9b1jlv25q1sjfhv8d46mii33f94dj0ccn83z9z18q4y2cm" + else throw "Encryptr for ${stdenv.hostPlatform.system} not supported!"; in stdenv.mkDerivation rec { name = "encryptr-${version}"; |