Merge pull request #123481 from stephank/fix-physfs2-darwin
physfs_2: fix darwin build
This commit is contained in:
commit
ab040108fb
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue