cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

physfs_2: fix darwin build

Browse source
This commit is contained in:
Stéphan Kochen 2021-05-18 11:44:16 +02:00
parent a1d1f086c7
commit 32cf9f8121
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/libraries/physfs/default.nix
View file

@ -1,5 +1,4 @@
{ lib, stdenv, fetchurl, cmake, doxygen, darwin { lib, stdenv, fetchurl, cmake, doxygen, zlib, Foundation, Carbon }:
, zlib }:
let let
generic = version: sha256: generic = version: sha256:
@ -15,7 +14,7 @@ let
nativeBuildInputs = [ cmake doxygen ]; nativeBuildInputs = [ cmake doxygen ];
buildInputs = [ zlib ] buildInputs = [ zlib ]
++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; ++ lib.optionals stdenv.isDarwin [ Foundation Carbon ];
patchPhase = '' patchPhase = ''
sed s,-Werror,, -i CMakeLists.txt sed s,-Werror,, -i CMakeLists.txt

4
pkgs/top-level/all-packages.nix
View file

@ -17217,7 +17217,9 @@ in
pe-parse = callPackage ../development/libraries/pe-parse { }; 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_2
physfs; physfs;