aiger: clean up configurePhase, install multi-output objects/headers

The library and header files are useful for other tools, such as
the upcoming 'lingeling'.

Signed-off-by: Austin Seipp <aseipp@pobox.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/pkgs/applications/science/logic/aiger/default.nix b/pkgs/applications/science/logic/aiger/default.nix
index 1a60c5e148c..03524fc6b22 100644
--- a/pkgs/applications/science/logic/aiger/default.nix
+++ b/pkgs/applications/science/logic/aiger/default.nix
@@ -13,18 +13,15 @@ stdenv.mkDerivation rec {
 
   configurePhase = ''
     # Set up picosat, so we can build 'aigbmc'
-    echo $(pwd)
-    ls ..
     mkdir ../picosat
     ln -s ${picosat}/include/picosat/picosat.h ../picosat/picosat.h
     ln -s ${picosat}/lib/picosat.o             ../picosat/picosat.o
     ln -s ${picosat}/share/picosat.version     ../picosat/VERSION
-    ls ..
     ./configure.sh
   '';
 
   installPhase = ''
-    mkdir -p $out/bin
+    mkdir -p $out/bin $dev/include $lib/lib
 
     # Do the installation manually, as the Makefile has odd
     # cyrillic characters, and this is easier than adding
@@ -41,8 +38,13 @@ stdenv.mkDerivation rec {
     for x in ''${BINS[*]}; do
       install -m 755 -s $x $out/bin/$x
     done
+
+    cp -v aiger.o $lib/lib
+    cp -v aiger.h $dev/include
   '';
 
+  outputs = [ "out" "dev" "lib" ];
+
   meta = {
     description = "And-Inverter Graph (AIG) utilities";
     homepage    = http://fmv.jku.at/aiger/;