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: c979f814d26a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 16e475de3802
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 4, 2020

  1. tor: fix cross compiling

    @sorki
    sorki committed May 4, 2020
    Copy the full SHA
    8aab081 View commit details

Commits on May 9, 2020

  1. Merge pull request #86767 from sorki/cc_tor 

    tor: fix cross compiling
    @joachifm
    joachifm authored May 9, 2020
    Copy the full SHA
    16e475d View commit details
Showing with 4 additions and 0 deletions.
  1. +4 −0 pkgs/tools/security/tor/default.nix
4 changes: 4 additions & 0 deletions pkgs/tools/security/tor/default.nix
View file
Original file line number Diff line number Diff line change
@@ -30,6 +30,10 @@ stdenv.mkDerivation rec {

patches = [ ./disable-monotonic-timer-tests.patch ];

# cross compiles correctly but needs the following
configureFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
"--disable-tool-name-check";

NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s";

postPatch = ''