diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2010-10-23 18:40:57 +0000 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2010-10-23 18:40:57 +0000 |
commit | 90b626421dd0590408a685083f39a9ffa6bdd3c0 (patch) | |
tree | 4c8c52f46d742cf979be19aac29561a95f74020a /pkgs/development/compilers/eql | |
parent | 0df1871b9d8878377aceda233f0cfd3deb72576b (diff) |
Make EQL buildable again
svn path=/nixpkgs/trunk/; revision=24434
Diffstat (limited to 'pkgs/development/compilers/eql')
-rw-r--r-- | pkgs/development/compilers/eql/default.nix | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/pkgs/development/compilers/eql/default.nix b/pkgs/development/compilers/eql/default.nix index eb0828b814b18..c4ed06a00eaf7 100644 --- a/pkgs/development/compilers/eql/default.nix +++ b/pkgs/development/compilers/eql/default.nix @@ -1,5 +1,6 @@ x@{builderDefsPackage - , fetchgit, qt4, ecl + , fetchgit, qt4, ecl, xorgserver + , xkbcomp, xkeyboard_config , ...}: builderDefsPackage (a : @@ -29,7 +30,7 @@ rec { inherit (sourceInfo) name version; inherit buildInputs; - phaseNames = ["setVars" "fixPaths" "buildEQLLib" "doQMake" "doMake" "buildLibEQL" "doDeploy"]; + phaseNames = ["setVars" "fixPaths" "firstMetaTypeId" "buildEQLLib" "doQMake" "doMake" "doDeploy"]; setVars = a.fullDepEntry ('' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC" @@ -39,20 +40,26 @@ rec { sed -re 's@[(]in-home "gui/.command-history"[)]@(concatenate '"'"'string (ext:getenv "HOME") "/.eql-gui-command-history")@' -i gui/gui.lisp '') ["minInit" "doUnpack"]; + firstMetaTypeId = a.fullDepEntry ('' + cd src + qmake first_metatype_id.pro + make + TMP=. + TMPDIR=. + XKB_BINDIR="${xkbcomp}/bin" Xvfb -once -reset -terminate :2 -xkbdir ${xkeyboard_config}/etc/X11/xkb & + DISPLAY=:2 ./first_metatype_id + '') ["doUnpack" "addInputs"]; + buildEQLLib = a.fullDepEntry ('' - cd src ecl -shell make-eql-lib.lisp - '') ["doUnpack" "addInputs"]; + qmake eql_lib.pro + make + '') ["doUnpack" "addInputs" "firstMetaTypeId"]; doQMake = a.fullDepEntry ('' - qmake - '') ["addInputs"]; - - buildLibEQL = a.fullDepEntry ('' - sed -i eql.pro -e 's@#CONFIG += eql_dll@CONFIG += eql_dll@' - qmake + qmake eql_exe.pro make - '') ["doUnpack" "addInputs"]; + '') ["addInputs" "firstMetaTypeId" "buildEQLLib"]; doDeploy = a.fullDepEntry ('' cd .. @@ -61,7 +68,7 @@ rec { ln -s $out/lib/eql/build-dir/eql $out/bin ln -s $out/lib/eql/build-dir/src/*.h $out/include ln -s $out/lib/eql/build-dir/src/gen/*.h $out/include/gen - mv $out/lib/eql/build-dir/my_app/libeql*.so* $out/lib + ln -s $out/lib/eql/build-dir/libeql*.so* $out/lib '') ["minInit" "defEnsureDir"]; meta = { |