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: 0d203bb28076
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3857a8bb25d7
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on Mar 26, 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.
    @infinisil
    infinisil committed Mar 26, 2019

    Unverified

    The signing certificate or its chain could not be verified.
    Certificate subject
    CN Seth Vargo
    emailAddress seth@sethvargo.com
    Certificate issuer
    CN SSL.com Client Certificate Intermediate CA RSA R2
    O SSL Corp
    Learn about vigilant mode
    Copy the full SHA
    cfd2e67 View commit details

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

    This should make it work on Darwin with clang.
    @infinisil
    infinisil committed Mar 26, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    271403c View commit details

Commits on Apr 28, 2019

  1. Merge pull request #58319 from Infinisil/fix-idris-gmp 

    idrisPackages: Fix linking to gmp library and cc
    @infinisil
    infinisil authored Apr 28, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3857a8b View commit details
Showing with 5 additions and 3 deletions.
  1. +5 −3 pkgs/development/idris-modules/idris-wrapper.nix
8 changes: 5 additions & 3 deletions pkgs/development/idris-modules/idris-wrapper.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
{ lib, symlinkJoin, makeWrapper, idris-no-deps, gcc, gmp }:
{ stdenv, lib, symlinkJoin, makeWrapper, idris-no-deps, gmp }:

symlinkJoin {
inherit (idris-no-deps) name src meta;
paths = [ idris-no-deps ];
buildInputs = [ makeWrapper ];
postBuild = ''
wrapProgram $out/bin/idris \
--run 'export IDRIS_CC=''${IDRIS_CC:-${lib.getBin gcc}/bin/gcc}' \
--suffix LIBRARY_PATH : ${lib.makeLibraryPath [ gmp ]}
--run 'export IDRIS_CC=''${IDRIS_CC:-${stdenv.cc}/bin/cc}' \
--set NIX_CC_WRAPPER_${stdenv.cc.infixSalt}_TARGET_HOST 1 \
--prefix NIX_CFLAGS_COMPILE " " "-I${lib.getDev gmp}/include" \
--prefix NIX_CFLAGS_LINK " " "-L${lib.getLib gmp}/lib"
'';
}