* Started moving from XFree86 to the freedesktop.org Xlibs libraries.

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

6 files changed, 21 insertions, 40 deletions

diff --git a/pkgs/development/libraries/gtk+-1/gdk-pixbuf/builder.sh b/pkgs/development/libraries/gtk+-1/gdk-pixbuf/builder.sh
index c3dc023830540..a73f5a6d5b8dc 100755
--- a/pkgs/development/libraries/gtk+-1/gdk-pixbuf/builder.sh
+++ b/pkgs/development/libraries/gtk+-1/gdk-pixbuf/builder.sh
@@ -1,10 +1,3 @@
-#! /bin/sh
-
-buildinputs="$gtk $libtiff $libjpeg $libpng"
-. $stdenv/setup || exit 1
-
-tar xvfj $src || exit 1
-cd gdk-pixbuf-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
+#! /bin/sh -e
+. $stdenv/setup
+genericBuild
diff --git a/pkgs/development/libraries/gtk+-1/gdk-pixbuf/default.nix b/pkgs/development/libraries/gtk+-1/gdk-pixbuf/default.nix
index 8fe9f5e0e1407..1b05fdb0ea43a 100644
--- a/pkgs/development/libraries/gtk+-1/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gtk+-1/gdk-pixbuf/default.nix
@@ -13,9 +13,6 @@ derivation {
     md5 = "05fcb68ceaa338614ab650c775efc2f2";
   };
 
-  stdenv = stdenv;
-  gtk = gtk;
-  libtiff = libtiff;
-  libjpeg = libjpeg;
-  libpng = libpng;
+  buildInputs = [gtk libtiff libjpeg libpng];
+  inherit stdenv;
 }
diff --git a/pkgs/development/libraries/gtk+-1/glib/builder.sh b/pkgs/development/libraries/gtk+-1/glib/builder.sh
index e6f721de3f4b6..a73f5a6d5b8dc 100755
--- a/pkgs/development/libraries/gtk+-1/glib/builder.sh
+++ b/pkgs/development/libraries/gtk+-1/glib/builder.sh
@@ -1,9 +1,3 @@
-#! /bin/sh
-
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd glib-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
+#! /bin/sh -e
+. $stdenv/setup
+genericBuild
diff --git a/pkgs/development/libraries/gtk+-1/glib/default.nix b/pkgs/development/libraries/gtk+-1/glib/default.nix
index 7ae9be406b3eb..eb61048c3af71 100644
--- a/pkgs/development/libraries/gtk+-1/glib/default.nix
+++ b/pkgs/development/libraries/gtk+-1/glib/default.nix
@@ -1,4 +1,6 @@
-{stdenv, fetchurl}: derivation {
+{stdenv, fetchurl}:
+
+derivation {
   name = "glib-1.2.10";
   system = stdenv.system;
   builder = ./builder.sh;
@@ -6,5 +8,5 @@
     url = ftp://ftp.gtk.org/pub/gtk/v1.2/glib-1.2.10.tar.gz;
     md5 = "6fe30dad87c77b91b632def29dd69ef9";
   };
-  stdenv = stdenv;
+  inherit stdenv;
 }
diff --git a/pkgs/development/libraries/gtk+-1/gtk+/builder.sh b/pkgs/development/libraries/gtk+-1/gtk+/builder.sh
index 14ba61f7054d4..3f0cb5a150528 100755
--- a/pkgs/development/libraries/gtk+-1/gtk+/builder.sh
+++ b/pkgs/development/libraries/gtk+-1/gtk+/builder.sh
@@ -1,13 +1,8 @@
-#! /bin/sh
-
-buildinputs="$x11 $glib"
+#! /bin/sh -e
 . $stdenv/setup
+genericBuild
 
-tar xvfz $src
-cd gtk+-*
-./configure --prefix=$out
-make
-make install
-
-mkdir $out/nix-support
-echo "$x11 $glib" > $out/nix-support/propagated-build-inputs
+if test -n "$_propagatedBuildInputs"; then
+    if ! test -x $out/nix-support; then mkdir $out/nix-support; fi
+    echo "$_propagatedBuildInputs" > $out/nix-support/propagated-build-inputs
+fi
diff --git a/pkgs/development/libraries/gtk+-1/gtk+/default.nix b/pkgs/development/libraries/gtk+-1/gtk+/default.nix
index 856b2ffcad0e5..fc8f45736d979 100644
--- a/pkgs/development/libraries/gtk+-1/gtk+/default.nix
+++ b/pkgs/development/libraries/gtk+-1/gtk+/default.nix
@@ -13,7 +13,7 @@ derivation {
     md5 = "4d5cb2fc7fb7830e4af9747a36bfce20";
   };
 
-  stdenv = stdenv;
-  x11 = x11;
-  glib = glib;
+  buildInputs = [x11 glib];
+  _propagatedBuildInputs = [x11 glib];
+  inherit stdenv;
 }