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

Commits on May 9, 2018

  1. generic-stack-builder: attempt to add propagation 

    Fixes #40039

This adds a shellHook to handle propagated dependencies like that seen
in #40039 where gpgme needed libgpg-error.
    @matthewbauer
    matthewbauer committed May 9, 2018
    Copy the full SHA
    527abe5 View commit details

  2. Merge pull request #40248 from matthewbauer/fix-generic-stack-builder 

    generic-stack-builder: attempt to add propagation
    @Ericson2314
    Ericson2314 authored May 9, 2018

    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
    12ee278 View commit details
Showing with 11 additions and 4 deletions.
  1. +11 −4 pkgs/development/haskell-modules/generic-stack-builder.nix
15 changes: 11 additions & 4 deletions pkgs/development/haskell-modules/generic-stack-builder.nix
View file
Original file line number Diff line number Diff line change
@@ -20,10 +20,17 @@ in stdenv.mkDerivation (args // {

STACK_PLATFORM_VARIANT="nix";
STACK_IN_NIX_SHELL=1;
STACK_IN_NIX_EXTRA_ARGS =
concatMap (pkg: ["--extra-lib-dirs=${getLib pkg}/lib"
"--extra-include-dirs=${getDev pkg}/include"]) buildInputs ++
extraArgs;
STACK_IN_NIX_EXTRA_ARGS = extraArgs;
shellHook = ''
for pkg in ''${pkgsHostHost[@]} ''${pkgsHostBuild[@]} ''${pkgsHostTarget[@]}
do
[ -d "$pkg/lib" ] && \
export STACK_IN_NIX_EXTRA_ARGS+=" --extra-lib-dirs=$pkg/lib"
[ -d "$pkg/include" ] && \
export STACK_IN_NIX_EXTRA_ARGS+=" --extra-include-dirs=$pkg/include"
done
'';


# XXX: workaround for https://ghc.haskell.org/trac/ghc/ticket/11042.
LD_LIBRARY_PATH = makeLibraryPath (LD_LIBRARY_PATH ++ buildInputs);