pyrox.dev
EQL: update to latest snapshot
+17
-22
pkgs/development/compilers/eql/default.nix
+17
-22
pkgs/development/compilers/eql/default.nix
···
12
12
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
13
13
sourceInfo = rec {
14
14
method = "fetchgit";
15
-
rev = "14f62c94f952104d27d920ea662c8a61b370abe8";
15
+
rev = "9097bf98446ee33c07bb155d800395775ce0d9b2";
16
16
url = "git://gitorious.org/eql/eql";
17
-
hash = "1ca31f0ad8cbc45d2fdf7b1e4059b1e612523c043f4688d7147c7e16fa5ba9ca";
17
+
hash = "1fp88xmmk1sa0iqxahfiv818bp2sbf66vqrd4xq9jb731ybdvsb8";
18
18
version = rev;
19
19
name = "eql-git-${version}";
20
20
};
···
30
30
inherit (sourceInfo) name version;
31
31
inherit buildInputs;
32
32
33
-
phaseNames = ["setVars" "fixPaths" "firstMetaTypeId" "buildEQLLib" "doQMake" "doMake" "doDeploy"];
33
+
phaseNames = ["setVars" "fixPaths" "doQMake" "doMake" "doDeploy"];
34
34
35
35
setVars = a.fullDepEntry (''
36
36
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC"
···
40
40
sed -re 's@[(]in-home "gui/.command-history"[)]@(concatenate '"'"'string (ext:getenv "HOME") "/.eql-gui-command-history")@' -i gui/gui.lisp
41
41
'') ["minInit" "doUnpack"];
42
42
43
-
firstMetaTypeId = a.fullDepEntry (''
44
-
cd src
45
-
qmake first_metatype_id.pro
46
-
make
47
-
TMP=.
48
-
TMPDIR=.
49
-
XKB_BINDIR="${xkbcomp}/bin" Xvfb -once -reset -terminate :2 -xkbdir ${xkeyboard_config}/etc/X11/xkb &
50
-
sleep 10;
51
-
DISPLAY=:2 ./first_metatype_id
52
-
'') ["doUnpack" "addInputs"];
53
-
54
-
buildEQLLib = a.fullDepEntry (''
55
-
ecl -shell make-eql-lib.lisp
56
-
qmake eql_lib.pro
57
-
make
58
-
'') ["doUnpack" "addInputs" "firstMetaTypeId"];
59
-
60
43
doQMake = a.fullDepEntry (''
44
+
cd src
61
45
qmake eql_exe.pro
62
46
make
63
-
'') ["addInputs" "firstMetaTypeId" "buildEQLLib"];
47
+
cd ..
48
+
cd src
49
+
'') ["addInputs" "doUnpack" "buildEQLLib"];
64
50
65
51
doDeploy = a.fullDepEntry (''
66
52
cd ..
···
70
56
ln -s $out/lib/eql/build-dir/src/*.h $out/include
71
57
ln -s $out/lib/eql/build-dir/src/gen/*.h $out/include/gen
72
58
ln -s $out/lib/eql/build-dir/libeql*.so* $out/lib
73
-
'') ["minInit" "defEnsureDir"];
59
+
'') ["minInit"];
60
+
61
+
buildEQLLib = a.fullDepEntry (''
62
+
cd src
63
+
ecl -shell make-eql-lib.lisp
64
+
qmake eql_lib.pro
65
+
make
66
+
cd ..
67
+
'') ["doUnpack" "addInputs"];
68
+
74
69
75
70
meta = {
76
71
description = "Embedded Qt Lisp (ECL+Qt)";