summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2009-12-14 00:14:55 +0000
committerMichael Raskin <7c6f434c@mail.ru>2009-12-14 00:14:55 +0000
commit1497cacb6e641c7c5a26a6bc5ac4e7cf8ff28056 (patch)
tree8076ac4c4977f5c434b67054d02c13aa5101f0b6 /pkgs/applications
parent43a41f3d1d49c900cdc62d153850e3ed62eadc7f (diff)
downloadnixlib-1497cacb6e641c7c5a26a6bc5ac4e7cf8ff28056.tar
nixlib-1497cacb6e641c7c5a26a6bc5ac4e7cf8ff28056.tar.gz
nixlib-1497cacb6e641c7c5a26a6bc5ac4e7cf8ff28056.tar.bz2
nixlib-1497cacb6e641c7c5a26a6bc5ac4e7cf8ff28056.tar.lz
nixlib-1497cacb6e641c7c5a26a6bc5ac4e7cf8ff28056.tar.xz
nixlib-1497cacb6e641c7c5a26a6bc5ac4e7cf8ff28056.tar.zst
nixlib-1497cacb6e641c7c5a26a6bc5ac4e7cf8ff28056.zip
adding libxcursor dependency
svn path=/nixpkgs/trunk/; revision=18930
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/science/math/content/default.nix15
1 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/applications/science/math/content/default.nix b/pkgs/applications/science/math/content/default.nix
index 7d053caf4ba9..15abc928f0fb 100644
--- a/pkgs/applications/science/math/content/default.nix
+++ b/pkgs/applications/science/math/content/default.nix
@@ -5,7 +5,7 @@ let
   version = "1.5"; 
   buildInputs = with a; [
     mesa lesstif libX11 libXaw xproto libXt libSM libICE 
-      libXmu libXext 
+      libXmu libXext libXcursor
   ];
 in
 rec {
@@ -29,7 +29,7 @@ rec {
 
   /* doConfigure should be removed if not needed */
   phaseNames = ["unpackTarballs" 
-    "setPlatform"
+    "setPlatform" "extraVars"
     "buildVibrant" "buildContent" 
     "install"];
 
@@ -52,6 +52,10 @@ rec {
     sed -e 's/${platformTLAContent}=no/${platformTLAContent}=/' -i content/makefile_v
   '') ["minInit" "unpackTarballs"];
 
+  extraVars = a.noDepEntry ''
+    export NIX_LDFLAGS="$NIX_LDFLAGS -lXcursor"
+  '';
+
   buildVibrant = a.fullDepEntry (''
     cd vibrant/build
     
@@ -73,7 +77,12 @@ rec {
   '') ["addInputs" "buildVibrant" "setPlatform"];
 
   install = a.fullDepEntry (''
-    ensureDir $out/share/${name}/build-snapshot
+    ensureDir $out/share/${name}/build-snapshot $out/bin $out/lib $out/share/${name}/doc
+    find . -name '*.o' -exec cp '{}' $out/lib ';'
+    find . -name '*.so' -exec cp '{}' $out/lib ';'
+    find . -name '*.txt' -exec cp '{}' $out/share/${name}/doc ';'
+    find . -name '*.hlp' -exec cp '{}' $out/share/${name}/doc ';'
+    find . -perm +111 -a ! -name '*.*' -exec cp '{}' $out/bin ';'
     cp -r . $out/share/${name}/build-snapshot
   '') ["buildContent" "defEnsureDir" "minInit"];