From 12ae5363ea658d399bdb008f6ded3cde355f9310 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 29 Mar 2004 17:23:01 +0000
Subject: * Remove trivial builders. * Make builders unexecutable by removing
 the hash-bang line and   execute permission. * Convert calls to `derivation'
 to `mkDerivation'. * Remove `system' and `stdenv' attributes from calls to  
 `mkDerivation'.  These transformations were all done automatically,   so it
 is quite possible I broke stuff. * Put the `mkDerivation' function in
 stdenv/generic.

svn path=/nixpkgs/trunk/; revision=874
---
 pkgs/development/libraries/gnome/libglade/builder.sh  | 2 --
 pkgs/development/libraries/gnome/libglade/default.nix | 4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)
 mode change 100755 => 100644 pkgs/development/libraries/gnome/libglade/builder.sh

(limited to 'pkgs/development/libraries/gnome/libglade')

diff --git a/pkgs/development/libraries/gnome/libglade/builder.sh b/pkgs/development/libraries/gnome/libglade/builder.sh
old mode 100755
new mode 100644
index 9917fd2c5e92..4c185c4c7a64
--- a/pkgs/development/libraries/gnome/libglade/builder.sh
+++ b/pkgs/development/libraries/gnome/libglade/builder.sh
@@ -1,5 +1,3 @@
-#! /bin/sh -e
-
 buildinputs="$pkgconfig $gtk $libxml2"
 . $stdenv/setup
 
diff --git a/pkgs/development/libraries/gnome/libglade/default.nix b/pkgs/development/libraries/gnome/libglade/default.nix
index 543586eb20a5..475bf9c9fa3a 100644
--- a/pkgs/development/libraries/gnome/libglade/default.nix
+++ b/pkgs/development/libraries/gnome/libglade/default.nix
@@ -2,15 +2,13 @@
 
 assert pkgconfig != null && gtk != null && libxml2 != null;
 
-derivation {
+stdenv.mkDerivation {
   name = "libglade-2.0.1";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://ftp.gnome.org/pub/GNOME/desktop/2.4/2.4.1/sources/libglade-2.0.1.tar.bz2;
     md5 = "4d93f6b01510013ae429e91af432cfe2";
   };
-  stdenv = stdenv;
   pkgconfig = pkgconfig;
   gtk = gtk;
   libxml2 = libxml2;
-- 
cgit 1.4.1