From 7768fa017806574447ae4948e29e771f1f8ce6f1 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 5 Dec 2010 19:08:32 +0000
Subject: Fix installation layout

svn path=/nixpkgs/trunk/; revision=24982
---
 pkgs/applications/science/math/singular/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'pkgs/applications/science/math/singular')

diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix
index 884d202e98e3..dfc97eca8ebe 100644
--- a/pkgs/applications/science/math/singular/default.nix
+++ b/pkgs/applications/science/math/singular/default.nix
@@ -29,11 +29,17 @@ rec {
   inherit buildInputs;
 
   /* doConfigure should be removed if not needed */
-  phaseNames = ["doFixPaths" "doConfigure" "doMakeInstall"];
+  phaseNames = ["doFixPaths" "doConfigure" "doMakeInstall" "fixInstall"];
   doFixPaths = a.fullDepEntry (''
     find . -exec sed -e 's@/bin/rm@${a.coreutils}&@g' -i '{}' ';'
     find . -exec sed -e 's@/bin/uname@${a.coreutils}&@g' -i '{}' ';'
   '') ["minInit" "doUnpack"];
+  fixInstall = a.fullDepEntry (''
+    rm -rf "$out/LIB"
+    cp -r Singular/LIB "$out"
+    ensureDir "$out/bin"
+    ln -s "$out"/*/Singular "$out/bin"
+  '') ["minInit" "defEnsureDir"];
       
   meta = {
     description = "A CAS for polynomial computations";
-- 
cgit 1.4.1