git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #123481 from stephank/fix-physfs2-darwin

physfs_2: fix darwin build

commitab040108fbcdc1225ede345a89e76c81d810d126 authorSandro <sandro.jaeckel@gmail.com> dateTue 18 May 2021, 13:00 (6 years ago) parent7bfe6b132cf9f8
2 files changed+5−4
pkgs/development/libraries/physfs/default.nix+2−3 pkgs/top-level/all-packages.nix+3−1
pkgs/development/libraries/physfs/default.nix+2−3
@@ -1,5 +1,4 @@
1−{ lib, stdenv, fetchurl, cmake, doxygen, darwin
2−, zlib }:
1+{ lib, stdenv, fetchurl, cmake, doxygen, zlib, Foundation, Carbon }:
32
43let
54 generic = version: sha256:
@@ -15,7 +14,7 @@ let
1514 nativeBuildInputs = [ cmake doxygen ];
1615
1716 buildInputs = [ zlib ]
18− ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation ];
17+ ++ lib.optionals stdenv.isDarwin [ Foundation Carbon ];
1918
2019 patchPhase = ''
2120 sed s,-Werror,, -i CMakeLists.txt
pkgs/top-level/all-packages.nix+3−1
@@ -17217,7 +17217,9 @@ in
1721717217
1721817218 pe-parse = callPackage ../development/libraries/pe-parse { };
1721917219
17220− inherit (callPackage ../development/libraries/physfs { })
17220+ inherit (callPackage ../development/libraries/physfs {
17221+ inherit (darwin.apple_sdk.frameworks) Foundation Carbon;
17222+ })
1722117223 physfs_2
1722217224 physfs;
1722317225