Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 64922cfde934
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 703e44675c5e
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 22, 2019

  1. openssl: switch to linux-x86 and linux-x86_64 targets

    @dingxiangfei2009 @FRidh
    dingxiangfei2009 authored and FRidh committed Oct 22, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    703e446 View commit details
Showing with 4 additions and 2 deletions.
  1. +4 −2 pkgs/development/libraries/openssl/default.nix
6 changes: 4 additions & 2 deletions pkgs/development/libraries/openssl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -44,10 +44,12 @@ let
# TODO(@Ericson2314): Improve with mass rebuild
configurePlatforms = [];
configureScript = {
x86_64-darwin = "./Configure darwin64-x86_64-cc";
x86_64-solaris = "./Configure solaris64-x86_64-gcc";
armv6l-linux = "./Configure linux-armv4 -march=armv6";
armv7l-linux = "./Configure linux-armv4 -march=armv7-a";
i686-linux = "./Configure linux-x86";
x86_64-darwin = "./Configure darwin64-x86_64-cc";
x86_64-linux = "./Configure linux-x86_64";
x86_64-solaris = "./Configure solaris64-x86_64-gcc";
}.${stdenv.hostPlatform.system} or (
if stdenv.hostPlatform == stdenv.buildPlatform
then "./config"