Author: raskin
Date: Mon Sep 20 08:10:12 2010
New Revision: 23869
URL: https://svn.nixos.org/websvn/nix/?rev=23869&sc=1

Log:
Allow building EQL applications

Modified:
   nixpkgs/trunk/pkgs/development/compilers/eql/default.nix

Modified: nixpkgs/trunk/pkgs/development/compilers/eql/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/eql/default.nix    Mon Sep 20 
07:48:17 2010        (r23868)
+++ nixpkgs/trunk/pkgs/development/compilers/eql/default.nix    Mon Sep 20 
08:10:12 2010        (r23869)
@@ -28,7 +28,7 @@
   inherit (sourceInfo) name version;
   inherit buildInputs;
 
-  phaseNames = ["fixPaths" "buildEQLLib" "doQMake" "doMake" "doDeploy"];
+  phaseNames = ["fixPaths" "buildEQLLib" "doQMake" "doMake" "buildLibEQL" 
"doDeploy"];
 
   fixPaths = a.fullDepEntry (''
     sed -re 's...@[(]in-home "gui/.command-history"[)]@(concatenate 
'"'"'string (ext:getenv "HOME") "/.eql-gui-command-history")@' -i gui/gui.lisp
@@ -43,11 +43,20 @@
     qmake
   '') ["addInputs"];
 
+  buildLibEQL = a.fullDepEntry (''
+    sed -i eql.pro -e 's...@#config += eql_...@config += eql_dll@'
+    qmake
+    make
+  '') ["doUnpack" "addInputs"];
+
   doDeploy = a.fullDepEntry (''
     cd ..
-    ensureDir $out/bin $out/lib/eql/
+    ensureDir $out/bin $out/lib/eql/ $out/include $out/include/gen $out/lib
     cp -r . $out/lib/eql/build-dir
     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
   '') ["minInit" "defEnsureDir"];
 
   meta = {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to