diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-01 20:52:03 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-04 14:54:48 +0200 |
| commit | 3096d03435bb177af8c4868a8efa637b393f2715 (patch) | |
| tree | b5353e40eb18bba0e86b04a176879f3e635f48e7 /pkgs/development/libraries/libssh | |
| parent | 4f60156afbb8d61d8d28db8ab594ec9328946d71 (diff) | |
| download | nixpkgs-3096d03435bb177af8c4868a8efa637b393f2715.tar nixpkgs-3096d03435bb177af8c4868a8efa637b393f2715.tar.gz nixpkgs-3096d03435bb177af8c4868a8efa637b393f2715.tar.bz2 nixpkgs-3096d03435bb177af8c4868a8efa637b393f2715.tar.lz nixpkgs-3096d03435bb177af8c4868a8efa637b393f2715.tar.xz nixpkgs-3096d03435bb177af8c4868a8efa637b393f2715.tar.zst nixpkgs-3096d03435bb177af8c4868a8efa637b393f2715.zip | |
Revert "Refactor mkFlag / shouldUsePkg into the nixpkgs libraries"
This reverts commit 25a148fa196b944b3f134527da87e43d88c066f9.
Diffstat (limited to 'pkgs/development/libraries/libssh')
| -rw-r--r-- | pkgs/development/libraries/libssh/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index 8ea2ac72da0..17bcf227c0e 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -7,8 +7,9 @@ , openssl ? null, libgcrypt ? null }: -with stdenv; let + shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null; + # Prefer openssl cryptoStr = if shouldUsePkg openssl != null then "openssl" else if shouldUsePkg libgcrypt != null then "libgcrypt" |