uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
35
pkgs/development/libraries/opencollada/default.nix
Normal file
35
pkgs/development/libraries/opencollada/default.nix
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libxml2, pcre
|
||||
, darwin}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opencollada";
|
||||
|
||||
version = "1.6.68";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "OpenCOLLADA";
|
||||
rev = "v${version}";
|
||||
sha256 = "1ym16fxx9qhf952vva71sdzgbm7ifis0h1n5fj1bfdj8zvvkbw5w";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AGL ]);
|
||||
|
||||
propagatedBuildInputs = [ libxml2 pcre ];
|
||||
|
||||
patchPhase = ''
|
||||
patch -p1 < ${./pcre.patch}
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp \
|
||||
--replace math.h cmath
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A library for handling the COLLADA file format";
|
||||
homepage = "https://github.com/KhronosGroup/OpenCOLLADA/";
|
||||
maintainers = [ lib.maintainers.eelco ];
|
||||
platforms = lib.platforms.unix;
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
14
pkgs/development/libraries/opencollada/pcre.patch
Normal file
14
pkgs/development/libraries/opencollada/pcre.patch
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
diff --git a/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h b/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h
|
||||
index 22f2598b..269c50ca 100644
|
||||
--- a/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h
|
||||
+++ b/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h
|
||||
@@ -13,8 +13,7 @@
|
||||
|
||||
#include "COLLADABUPrerequisites.h"
|
||||
|
||||
-struct real_pcre;
|
||||
-typedef struct real_pcre pcre;
|
||||
+#include "pcre.h"
|
||||
|
||||
|
||||
namespace COLLADABU
|
||||
Loading…
Add table
Add a link
Reference in a new issue