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
34
pkgs/development/ocaml-modules/piqi/default.nix
Normal file
34
pkgs/development/ocaml-modules/piqi/default.nix
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
{ lib, stdenv, fetchFromGitHub, ocaml, findlib, which, sedlex, easy-format, xmlm, base64 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.6.15";
|
||||
pname = "piqi";
|
||||
name = "ocaml${ocaml.version}-${pname}-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alavrik";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0v04hs85xv6d4ysqxyv1dik34dx49yab9shpi4x7iv19qlzl7csb";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ocaml findlib which ];
|
||||
propagatedBuildInputs = [ sedlex xmlm easy-format base64 ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
patches = [ ./no-ocamlpath-override.patch ];
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
postBuild = "make -C piqilib piqilib.cma";
|
||||
|
||||
installTargets = [ "install" "ocaml-install" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://piqi.org";
|
||||
description = "Universal schema language and a collection of tools built around it";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.maurer ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
diff -rupN piqi-0.6.12.orig/make/Makefile.ocaml piqi-0.6.12/make/Makefile.ocaml
|
||||
--- piqi-0.6.12.orig/make/Makefile.ocaml 2015-03-13 13:35:19.000000000 +0100
|
||||
+++ piqi-0.6.12/make/Makefile.ocaml 2015-06-10 21:19:57.231000000 +0200
|
||||
@@ -1,13 +1,5 @@
|
||||
OCAMLMAKEFILE := $(PIQI_ROOT)/make/OCamlMakefile
|
||||
|
||||
-
|
||||
-OCAMLPATH := $(PIQI_BUILD)/lib/ocaml
|
||||
-ifeq ($(SYSTEM),$(filter $(SYSTEM),mingw mingw64))
|
||||
-OCAMLPATH := $(shell cygpath -w $(OCAMLPATH))
|
||||
-endif
|
||||
-export OCAMLPATH
|
||||
-
|
||||
-
|
||||
# make sure camlp4o produces pretty-printed text instead of AST
|
||||
export CAMLP4_O = $(CAMLP4)o -printer o
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue