diff options
Diffstat (limited to 'pkgs/development/libraries/gtk+/glib')
-rw-r--r-- | pkgs/development/libraries/gtk+/glib/builder.sh | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/gtk+/glib/default.nix | 5 |
2 files changed, 1 insertions, 12 deletions
diff --git a/pkgs/development/libraries/gtk+/glib/builder.sh b/pkgs/development/libraries/gtk+/glib/builder.sh deleted file mode 100644 index 5f12963eb8bea..0000000000000 --- a/pkgs/development/libraries/gtk+/glib/builder.sh +++ /dev/null @@ -1,8 +0,0 @@ -buildinputs="$pkgconfig $gettext $perl" -. $stdenv/setup || exit 1 - -tar xvfj $src || exit 1 -cd glib-* || exit 1 -./configure --prefix=$out || exit 1 -make || exit 1 -make install || exit 1 diff --git a/pkgs/development/libraries/gtk+/glib/default.nix b/pkgs/development/libraries/gtk+/glib/default.nix index 83700be486338..22d01d0d86f6f 100644 --- a/pkgs/development/libraries/gtk+/glib/default.nix +++ b/pkgs/development/libraries/gtk+/glib/default.nix @@ -4,12 +4,9 @@ assert pkgconfig != null && gettext != null && perl != null; stdenv.mkDerivation { name = "glib-2.2.3"; - builder = ./builder.sh; src = fetchurl { url = ftp://ftp.gtk.org/pub/gtk/v2.2/glib-2.2.3.tar.bz2; md5 = "aa214a10d873b68ddd67cd9de2ccae55"; }; - pkgconfig = pkgconfig; - gettext = gettext; - perl = perl; + buildInputs = [pkgconfig gettext perl]; } |