Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
base: 82e1691d3b10
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 112f522d48c5
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jul 27, 2019

  1. idrisPackages.idris-wrapper: Fix linking to gmp library 

    This has been broken since 5d18129,
which updated idris from 1.3.0 to 1.3.1, which included
idris-lang/Idris-dev#4472 as the cause of the
error. I'm still not entirely sure why this broke it though.

This now way should be rather future proof, it uses NIX_CFLAGS to pass
gpm link flags to our CC wrapper directly. The
`NIX_CC_WRAPPER_${stdenv.cc.infixSalt}_TARGET_HOST` part I'm pretty sure
is needed for the CC wrapper to know that those CFLAGS are meant for the
cc running on the HOST.

(cherry picked from commit cfd2e67)
    @infinisil @rycee
    infinisil authored and rycee committed Jul 27, 2019
    Copy the full SHA
    203b026 View commit details
    Browse the repository at this point in the history

  2. idrisPackages.idris-wrapper: Use stdenv's cc instead of always gcc 

    This should make it work on Darwin with clang.

(cherry picked from commit 271403c)
    @infinisil @rycee
    infinisil authored and rycee committed Jul 27, 2019
    Copy the full SHA
    112f522 View commit details
    Browse the repository at this point in the history