* Fix packages.

svn path=/nixpkgs/trunk/; revision=118

6 files changed, 50 insertions, 7 deletions

diff --git a/build/wxPython-build.sh b/build/wxPython-build.sh
new file mode 100755
index 0000000000000..9a61ce72663f3
--- /dev/null
+++ b/build/wxPython-build.sh
@@ -0,0 +1,16 @@
+#! /bin/sh
+
+export PATH=$pkgconfig/bin:/bin:/usr/bin
+export PKG_CONFIG_PATH=$glib/lib/pkgconfig:$atk/lib/pkgconfig:$pango/lib/pkgconfig:$gtk/lib/pkgconfig
+export LD_LIBRARY_PATH=$glib/lib:$atk/lib:$pango/lib:$gtk/lib:$pspell/lib:$fontconfig/lib:$Xft/lib:$freetype/lib
+
+top=`pwd`
+tar xvfz $src || exit 1
+cd wxPythonSrc-* || exit 1
+./configure --prefix=$top --enable-gtk2 --enable-rpath=$top/lib --with-opengl || exit 1
+make || exit 1
+make install || exit 1
+cd wxPython || exit 1
+python setup.py WX_CONFIG=$top/bin/wx-config WXPORT=gtk2 build install --root=$top/python || exit 1
+cd $top || exit 1
+rm -rf wxPythonSrc-* || exit 1
diff --git a/descriptors/wxPython-2.4.0.7.fix b/descriptors/wxPython-2.4.0.7.fix
new file mode 100644
index 0000000000000..d64c4b39172ce
--- /dev/null
+++ b/descriptors/wxPython-2.4.0.7.fix
@@ -0,0 +1,17 @@
+Descr(
+  [ Bind("pkgId", "wxPython-2.4.0.7")
+  , Bind("releaseId", "1")
+
+  , Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
+  , Bind("glib", Fix("./glib-2.2.1.fix"))
+  , Bind("atk", Fix("./atk-1.2.0.fix"))
+  , Bind("freetype", Fix("./freetype-2.1.4.fix"))
+  , Bind("fontconfig", Fix("./fontconfig-20021121.fix"))
+  , Bind("Xft", Fix("./Xft-20021121.fix"))
+  , Bind("pango", Fix("./pango-1.2.1.fix"))
+  , Bind("gtk", Fix("./gtk+-2.2.1.fix"))
+
+  , Bind("src", Url("c7864b56ff1422697a310f91f54c7ed6", "http://heanet.dl.sourceforge.net/sourceforge/wxpython/wxPythonSrc-2.4.0.7.tar.gz"))
+  , Bind("build", Local("../build/wxPython-build.sh"))
+  ]
+)
diff --git a/pkgs/aterm/aterm.fix b/pkgs/aterm/aterm.fix
index 604ecb498df33..5abf5e228a933 100644
--- a/pkgs/aterm/aterm.fix
+++ b/pkgs/aterm/aterm.fix
@@ -1,9 +1,9 @@
 Package(
-  [ ("src", App(IncludeFix("fetchurl/expr.fix"),
+  [ ("id", "aterm-2.0")
+  , ("build", Relative("aterm/aterm-build.sh"))
+  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
       [ ("url", "http://www.cwi.nl/projects/MetaEnv/aterm/aterm-2.0.tar.gz")
       , ("hash", "653b1bb8140ee0206b00aab126ef412e")
-      ])
-  , ("build", Relative("aterm-build.sh"))
-  , ("id", "aterm-2.0")
+      ]))
   ]
 )
diff --git a/pkgs/fetchurl/fetchurl.fix b/pkgs/fetchurl/fetchurl.fix
index c6a708cfe8e99..39c5e10e900b9 100644
--- a/pkgs/fetchurl/fetchurl.fix
+++ b/pkgs/fetchurl/fetchurl.fix
@@ -3,6 +3,7 @@ Function(["url", "hash"],
     [ ("build", Relative("fetchurl/fetchurl.sh"))
     , ("url", Var("url"))
     , ("hash", Var("hash"))
+    , ("id", "fetched-from-url")
     ]
   )
 )
diff --git a/build/pkgconfig-build.sh b/pkgs/pkgconfig/pkgconfig-build.sh
index beceddfb6469b..4cbce82670c9f 100755
--- a/build/pkgconfig-build.sh
+++ b/pkgs/pkgconfig/pkgconfig-build.sh
@@ -2,11 +2,12 @@
 
 export PATH=/bin:/usr/bin
 
-top=`pwd`
+mkdir $out || exit 1
+cd $out || exit 1
 tar xvfz $src || exit 1
 cd pkgconfig-* || exit 1
-./configure --prefix=$top || exit 1
+./configure --prefix=$out || exit 1
 make || exit 1
 make install || exit 1
-cd .. || exit 1
+cd $out || exit 1
 rm -rf pkgconfig-* || exit 1
diff --git a/pkgs/system/system.fix b/pkgs/system/system.fix
new file mode 100644
index 0000000000000..3279c5ba9f854
--- /dev/null
+++ b/pkgs/system/system.fix
@@ -0,0 +1,8 @@
+Package(
+  [ ("id", "system")
+  , ("build", Relative("system/populate-linkdirs.pl"))
+
+  , ("actATerm", IncludeFix("aterm/aterm.fix"))
+  , ("actPkgConfig", IncludeFix("pkgconfig/pkgconfig.fix"))
+  ]
+)