From 32cf9f812137f339bbc0759ffa2ecc70ceae61e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 18 May 2021 11:44:16 +0200 Subject: [PATCH] physfs_2: fix darwin build --- pkgs/development/libraries/physfs/default.nix | 5 ++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix index 3eb4077d985..faa338c94fc 100644 --- a/pkgs/development/libraries/physfs/default.nix +++ b/pkgs/development/libraries/physfs/default.nix @@ -1,5 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, doxygen, darwin -, zlib }: +{ lib, stdenv, fetchurl, cmake, doxygen, zlib, Foundation, Carbon }: let generic = version: sha256: @@ -15,7 +14,7 @@ let nativeBuildInputs = [ cmake doxygen ]; buildInputs = [ zlib ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; + ++ lib.optionals stdenv.isDarwin [ Foundation Carbon ]; patchPhase = '' sed s,-Werror,, -i CMakeLists.txt diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c030fb9453f..008314bac1e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17217,7 +17217,9 @@ in pe-parse = callPackage ../development/libraries/pe-parse { }; - inherit (callPackage ../development/libraries/physfs { }) + inherit (callPackage ../development/libraries/physfs { + inherit (darwin.apple_sdk.frameworks) Foundation Carbon; + }) physfs_2 physfs;