Merge pull request #123481 from stephank/fix-physfs2-darwin

physfs_2: fix darwin build

authored by

Sandro and committed by
GitHub
ab040108 7bfe6b14

+5 -4
+2 -3
pkgs/development/libraries/physfs/default.nix
··· 1 - { lib, stdenv, fetchurl, cmake, doxygen, darwin 2 - , zlib }: 3 4 let 5 generic = version: sha256: ··· 15 nativeBuildInputs = [ cmake doxygen ]; 16 17 buildInputs = [ zlib ] 18 - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; 19 20 patchPhase = '' 21 sed s,-Werror,, -i CMakeLists.txt
··· 1 + { lib, stdenv, fetchurl, cmake, doxygen, zlib, Foundation, Carbon }: 2 3 let 4 generic = version: sha256: ··· 14 nativeBuildInputs = [ cmake doxygen ]; 15 16 buildInputs = [ zlib ] 17 + ++ lib.optionals stdenv.isDarwin [ Foundation Carbon ]; 18 19 patchPhase = '' 20 sed s,-Werror,, -i CMakeLists.txt
+3 -1
pkgs/top-level/all-packages.nix
··· 17217 17218 pe-parse = callPackage ../development/libraries/pe-parse { }; 17219 17220 - inherit (callPackage ../development/libraries/physfs { }) 17221 physfs_2 17222 physfs; 17223
··· 17217 17218 pe-parse = callPackage ../development/libraries/pe-parse { }; 17219 17220 + inherit (callPackage ../development/libraries/physfs { 17221 + inherit (darwin.apple_sdk.frameworks) Foundation Carbon; 17222 + }) 17223 physfs_2 17224 physfs; 17225