public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

llpp: 30 -> 31

Browse Source
This commit is contained in:
Matthieu Coudron 2019-09-12 17:13:36 +09:00 committed by Matthieu Coudron
parent 8c5898347d
commit 8a4029fa8b
2 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/llpp/default.nix
View File

@ -5,12 +5,12 @@ assert lib.versionAtLeast (lib.getVersion ocaml) "4.07";
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "llpp"; pname = "llpp";
version = "30"; version = "31";
src = fetchgit { src = fetchgit {
url = "git://repo.or.cz/llpp.git"; url = "git://repo.or.cz/llpp.git";
rev = "v${version}"; rev = "v${version}";
sha256 = "0iilpzf12hs0zky58j55l4y5dvzv7fc53nsrg324n9vka92mppvd"; sha256 = "14ibsm1zzxfidjajcj30b5m9in10q3817izahsjvkmryrvvn6qsg";
fetchSubmodules = false; fetchSubmodules = false;
}; };

34
pkgs/applications/misc/llpp/fix-build-bash.patch
View File

@ -1,14 +1,5 @@
From cccadedfbcb6764a38382154838113a6b2fd4dee Mon Sep 17 00:00:00 2001
From: Michael Hoang <enzime@users.noreply.github.com>
Date: Mon, 10 Dec 2018 15:08:01 +1100
Subject: [PATCH] Patch build.bash for nixpkgs
---
build.bash | 37 ++-----------------------------------
1 file changed, 2 insertions(+), 35 deletions(-)
diff --git a/build.bash b/build.bash diff --git a/build.bash b/build.bash
index 1588011..72117d9 100755 index 7c278b6..41494c5 100755
--- a/build.bash --- a/build.bash
+++ b/build.bash +++ b/build.bash
@@ -29,7 +29,6 @@ srcd="$(dirname $0)" @@ -29,7 +29,6 @@ srcd="$(dirname $0)"
@ -20,10 +11,10 @@ index 1588011..72117d9 100755
mkdir -p $outd/{$wsid,lablGL} mkdir -p $outd/{$wsid,lablGL}
:>$outd/ordered :>$outd/ordered
@@ -39,12 +38,6 @@ isfresh() { test -r "$1.past" && . "$1.past" && test "$k" = "$2"; } @@ -39,12 +38,6 @@ isfresh() { test -r "$1.past" && . "$1.past" && test "$k" = "$2"; }
mbt=native mbt=${mbt:-native}
mulibs="$mudir/build/$mbt/libmupdf.a" # $mudir/build/$mbt/libmupdf-third.a mulibs="$mudir/build/$mbt/libmupdf.a" # $mudir/build/$mbt/libmupdf-third.a
-keycmd="(cd $mudir && git describe --tags --dirty); digest $mulibs" -keycmd="(cd $mudir && make -q build=$mbt libs && echo); digest $mulibs"
-isfresh "$mulibs" "$(eval $keycmd)" || ( -isfresh "$mulibs" "$(eval $keycmd)" || (
- make -C "$mudir" build=$mbt -j $mjobs libs - make -C "$mudir" build=$mbt -j $mjobs libs
- echo "k='$(eval $keycmd)'" >$mudir/build/$mbt/libmupdf.a.past - echo "k='$(eval $keycmd)'" >$mudir/build/$mbt/libmupdf.a.past
@ -32,12 +23,12 @@ index 1588011..72117d9 100755
oincs() { oincs() {
local i= local i=
local incs1= local incs1=
@@ -90,32 +83,6 @@ mflags() { @@ -90,34 +83,6 @@ mflags() {
} }
overs="$(ocamlc -vnum 2>/dev/null)" || overs="" overs="$(ocamlc -vnum 2>/dev/null)" || overs=""
-test "$overs" = "4.07.0" || { -test "$overs" = "4.08" || {
- url=https://caml.inria.fr/pub/distrib/ocaml-4.07/ocaml-4.07.0.tar.xz - url=https://caml.inria.fr/pub/distrib/ocaml-4.08/ocaml-4.08.0.tar.xz
- txz=$outd/$(basename $url) - txz=$outd/$(basename $url)
- isfresh $txz $url || { - isfresh $txz $url || {
- executable_p() { command -v "$1" >/dev/null 2>&1; } - executable_p() { command -v "$1" >/dev/null 2>&1; }
@ -54,8 +45,10 @@ index 1588011..72117d9 100755
- tar xf $txz -C $outd - tar xf $txz -C $outd
- bn=$(basename $url) - bn=$(basename $url)
- cd $outd/${bn%.tar.xz} - cd $outd/${bn%.tar.xz}
- ./configure -prefix $absprefix \ - ./configure --disable-vmthreads --disable-graph-lib \
- -no-graph -no-debugger -no-ocamldoc -no-native-compiler - --disable-ocamldoc --enable-debugger=no \
- --disable-flat-float-array \
- --prefix=$absprefix
- make -j $mjobs world - make -j $mjobs world
- make install - make install
- echo "k='$url'" >$absprefix/bin/ocamlc.past - echo "k='$url'" >$absprefix/bin/ocamlc.past
@ -65,7 +58,7 @@ index 1588011..72117d9 100755
bocaml1() { bocaml1() {
grep -q "$3" $outd/ordered || { grep -q "$3" $outd/ordered || {
@@ -224,7 +191,7 @@ bobjc() { @@ -227,7 +192,7 @@ bobjc() {
} && vecho "fresh $o" } && vecho "fresh $o"
} }
@ -74,7 +67,7 @@ index 1588011..72117d9 100755
cmd="(. $srcd/genconfstr.sh >$outd/confstruct.ml)" cmd="(. $srcd/genconfstr.sh >$outd/confstruct.ml)"
keycmd="digest $srcd/genconfstr.sh $outd/confstruct.ml" keycmd="digest $srcd/genconfstr.sh $outd/confstruct.ml"
@@ -278,7 +245,7 @@ for m in ml_gl ml_glarray ml_raw; do @@ -281,7 +246,7 @@ for m in ml_gl ml_glarray ml_raw; do
done done
libs="str.cma unix.cma" libs="str.cma unix.cma"
@ -83,6 +76,3 @@ index 1588011..72117d9 100755
if $darwin; then if $darwin; then
mcomp=$(ocamlc -config | grep bytecomp_c_co | { read _ c; echo $c; }) mcomp=$(ocamlc -config | grep bytecomp_c_co | { read _ c; echo $c; })
clibs="$clibs -framework Cocoa -framework OpenGL" clibs="$clibs -framework Cocoa -framework OpenGL"
--
2.19.2