nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-30 11:50:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #137385 from trofi/fix-xcbuild

Browse Source
This commit is contained in:
Sandro
2021-09-21 20:16:08 +02:00
committed by GitHub
parent 4e25d90548 84f53b8244
commit e755bb255b
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/tools/xcbuild/default.nix
View File

@@ -30,6 +30,8 @@ in stdenv.mkDerivation {
sha256 = "1xxwg2849jizxv0g1hy0b1m3i7iivp9bmc4f5pi76swsn423d41m";
};
patches = [ ./includes.patch ];
prePatch = ''
rmdir ThirdParty/*
cp -r --no-preserve=all ${googletest} ThirdParty/googletest

10
pkgs/development/tools/xcbuild/includes.patch Normal file
View File

@@ -0,0 +1,10 @@
--- a/Libraries/plist/Sources/Format/Encoding.cpp
+++ b/Libraries/plist/Sources/Format/Encoding.cpp
@@ -11,6 +11,7 @@
#include <plist/Format/unicode.h>
#include <cassert>
+#include <cstdlib> /* abort() */
#if defined(__linux__)
#include <endian.h>