diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-08-23 10:09:14 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:07:03 +0000 |
| commit | 63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f (patch) | |
| tree | d58934cb48f9c953b19a0d0d5cffc0d0c5561471 /nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix | |
| parent | c4eef3dacb2a3d359561f30917d9e3cc4e041be9 (diff) | |
| parent | 91a22f76cd1716f9d0149e8a5c68424bb691de15 (diff) | |
| download | nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.gz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.bz2 nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.lz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.xz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.zst nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix index b800debe15ee..2dbfac30da5a 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix @@ -35,7 +35,6 @@ self: super: ({ double-conversion = addExtraLibrary pkgs.libcxx super.double-conversion; streamly = addBuildDepend darwin.apple_sdk.frameworks.Cocoa super.streamly; - streamly_0_9_0 = addBuildDepend darwin.apple_sdk.frameworks.Cocoa super.streamly_0_9_0; apecs-physics = addPkgconfigDepends [ darwin.apple_sdk.frameworks.ApplicationServices @@ -301,6 +300,15 @@ self: super: ({ '' + drv.postPatch or ""; }) super.foldl; + # https://hydra.nixos.org/build/230964714/nixlog/1 + inline-c-cpp = appendPatch (pkgs.fetchpatch { + url = "https://github.com/fpco/inline-c/commit/e8dc553b13bb847409fdced649a6a863323cff8a.patch"; + name = "revert-use-system-cxx-std-lib.patch"; + sha256 = "sha256-ql1/+8bvmWexyCdFR0VS4M4cY2lD0Px/9dHYLqlKyNA="; + revert = true; + stripLen = 1; + }) super.inline-c-cpp; + } // lib.optionalAttrs pkgs.stdenv.isAarch64 { # aarch64-darwin # https://github.com/fpco/unliftio/issues/87 |