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

Commits on Oct 5, 2019

  1. haskellPackages.proteaaudio: link with the AudioToolbox framework on … 

    …Darwin

The build is currently failing on Darwin due to missing headers. see #70151
    Konstantinos Sideris committed Oct 5, 2019
    Copy the full SHA
    c4a42a7 View commit details

Commits on Oct 7, 2019

  1. Merge pull request #70152 from mujx/proteaaudio-override 

    haskellPackages.proteaaudio: link with the AudioToolbox framework on Darwin
    @peti
    peti authored Oct 7, 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
    f6f043f 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
@@ -104,6 +104,11 @@ self: super: builtins.intersectAttrs super {
then addExtraLibrary super.OpenAL pkgs.darwin.apple_sdk.frameworks.OpenAL
else super.OpenAL;

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

ghcid = enableSeparateBinOutput super.ghcid;

hzk = overrideCabal super.hzk (drv: {