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

Commits on Oct 5, 2019

  1. haskellPackages.OpenAL: link with the OpenAL framework on Darwin (#70150 

    )

* haskellPackages.OpenAL: link with the OpenAL framework on Darwin

The missing framework caused a build failure on Darwin. Fixes #68306.
    @mujx @peti
    mujx authored and peti committed Oct 5, 2019
    Copy the full SHA
    0b1fb4f View commit details
Showing with 5 additions and 0 deletions.
  1. +5 −0 pkgs/development/haskell-modules/configuration-nix.nix
5 changes: 5 additions & 0 deletions pkgs/development/haskell-modules/configuration-nix.nix
View file
Original file line number Diff line number Diff line change
@@ -99,6 +99,11 @@ self: super: builtins.intersectAttrs super {

niv = enableSeparateBinOutput super.niv;

# Ensure the necessary frameworks for Darwin.
OpenAL = if pkgs.stdenv.isDarwin
then addExtraLibrary super.OpenAL pkgs.darwin.apple_sdk.frameworks.OpenAL
else super.OpenAL;

ghcid = enableSeparateBinOutput super.ghcid;

hzk = overrideCabal super.hzk (drv: {