b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source 
physfs_2: fix darwin build
This commit is contained in:
Sandro 2021-05-18 13:00:55 +02:00 committed by GitHub
parent 7bfe6b141d 32cf9f8121
commit ab040108fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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
, 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

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

@ -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;