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

Commits on May 6, 2021

  1. haskellPackages: fix eval of darwin specific overrides

    @sternenseemann
    sternenseemann committed May 6, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    mkg20001 Maciej Krüger
    GPG key ID: 0D948CE19CF49C5F
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a51a542 View commit details
Showing with 7 additions and 7 deletions.
  1. +7 −7 pkgs/development/haskell-modules/configuration-nix.nix
14 changes: 7 additions & 7 deletions pkgs/development/haskell-modules/configuration-nix.nix
View file
Original file line number Diff line number Diff line change
@@ -858,15 +858,15 @@ self: super: builtins.intersectAttrs super {
'' + (drv.postInstall or "");
});

# TODO(@sternenseemann): can we determine this statically in cabal2nix?
FractalArt = super.FractalArt.override
(lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin {
objc = pkgs.darwin.libojc;
});
FractalArt = overrideCabal super.FractalArt (drv: {
librarySystemDepends = pkgs.lib.optionals pkgs.stdenv.hostPlatform.isDarwin [
pkgs.darwin.libobjc
] ++ (drv.librarySystemDepends or []);
});

arbtt = overrideCabal super.arbtt (drv: {
librarySystemDepends = lib.optionals pkgs.stdenv.hostPlatform.isDarwin [
librarySystemDepends = pkgs.lib.optionals pkgs.stdenv.hostPlatform.isDarwin [
pkgs.darwin.apple_sdk.frameworks.Foundation
] ++ (drv.librarySystemDepends or [])
] ++ (drv.librarySystemDepends or []);
});
}