diff options
Diffstat (limited to 'pkgs/development/libraries/gnome')
26 files changed, 13 insertions, 65 deletions
diff --git a/pkgs/development/libraries/gnome/GConf/builder.sh b/pkgs/development/libraries/gnome/GConf/builder.sh index 814beb573617c..19d7bf711adf3 100755..100644 --- a/pkgs/development/libraries/gnome/GConf/builder.sh +++ b/pkgs/development/libraries/gnome/GConf/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh -e - buildinputs="$pkgconfig $perl $glib $gtk $libxml2 $ORBit2 $popt" . $stdenv/setup diff --git a/pkgs/development/libraries/gnome/GConf/default.nix b/pkgs/development/libraries/gnome/GConf/default.nix index 31f144b1d79d4..e6163c9f381eb 100644 --- a/pkgs/development/libraries/gnome/GConf/default.nix +++ b/pkgs/development/libraries/gnome/GConf/default.nix @@ -4,15 +4,13 @@ assert pkgconfig != null && perl != null && glib != null && gtk != null && libxml2 != null && ORBit2 != null && popt != null; -derivation { +stdenv.mkDerivation { name = "GConf-2.4.0.1"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://ftp.gnome.org/pub/GNOME/desktop/2.4/2.4.1/sources/GConf-2.4.0.1.tar.bz2; md5 = "2f7548d0bad24d7c4beba54d0ec98a20"; }; - stdenv = stdenv; pkgconfig = pkgconfig; perl = perl; # Perl is not `supposed' to be required, but it is. glib = glib; diff --git a/pkgs/development/libraries/gnome/ORBit2/builder.sh b/pkgs/development/libraries/gnome/ORBit2/builder.sh index 87dbfe6cf9927..466ad2087e325 100755..100644 --- a/pkgs/development/libraries/gnome/ORBit2/builder.sh +++ b/pkgs/development/libraries/gnome/ORBit2/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh -e - buildinputs="$pkgconfig $glib $libIDL $popt" . $stdenv/setup diff --git a/pkgs/development/libraries/gnome/ORBit2/default.nix b/pkgs/development/libraries/gnome/ORBit2/default.nix index 8203db963ca90..d1fc483716b13 100644 --- a/pkgs/development/libraries/gnome/ORBit2/default.nix +++ b/pkgs/development/libraries/gnome/ORBit2/default.nix @@ -3,15 +3,13 @@ assert pkgconfig != null && glib != null && libIDL != null && popt != null; -derivation { +stdenv.mkDerivation { name = "ORBit2-2.8.3"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = ftp://ftp.gnome.org/pub/gnome/sources/ORBit2/2.8/ORBit2-2.8.3.tar.bz2; md5 = "c6c4b63de2f70310e33a52a37257ddaf"; }; - stdenv = stdenv; pkgconfig = pkgconfig; glib = glib; libIDL = libIDL; diff --git a/pkgs/development/libraries/gnome/esound/builder.sh b/pkgs/development/libraries/gnome/esound/builder.sh index bebb21cafdafd..a2c5cca65f3b0 100755..100644 --- a/pkgs/development/libraries/gnome/esound/builder.sh +++ b/pkgs/development/libraries/gnome/esound/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh -e - buildinputs="$audiofile" . $stdenv/setup diff --git a/pkgs/development/libraries/gnome/esound/default.nix b/pkgs/development/libraries/gnome/esound/default.nix index 7e51b9d6fba67..5dd792ef67cec 100644 --- a/pkgs/development/libraries/gnome/esound/default.nix +++ b/pkgs/development/libraries/gnome/esound/default.nix @@ -2,14 +2,12 @@ assert audiofile != null; -derivation { +stdenv.mkDerivation { name = "esound-0.2.32"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://ftp.gnome.org/pub/GNOME/desktop/2.4/2.4.1/sources/esound-0.2.32.tar.bz2; md5 = "b2a5e71ec8220fea1c22cc042f5f6e63"; }; - stdenv = stdenv; audiofile = audiofile; } diff --git a/pkgs/development/libraries/gnome/gnome-mime-data/builder.sh b/pkgs/development/libraries/gnome/gnome-mime-data/builder.sh index 46d023e04a376..60cd167a542f5 100755..100644 --- a/pkgs/development/libraries/gnome/gnome-mime-data/builder.sh +++ b/pkgs/development/libraries/gnome/gnome-mime-data/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - buildinputs="$pkgconfig $perl" . $stdenv/setup || exit 1 diff --git a/pkgs/development/libraries/gnome/gnome-mime-data/default.nix b/pkgs/development/libraries/gnome/gnome-mime-data/default.nix index ffcd6d19a78cb..d523fd60c8659 100644 --- a/pkgs/development/libraries/gnome/gnome-mime-data/default.nix +++ b/pkgs/development/libraries/gnome/gnome-mime-data/default.nix @@ -2,15 +2,13 @@ assert pkgconfig != null && perl != null; -derivation { +stdenv.mkDerivation { name = "gnome-mime-data-2.4.0"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://ftp.gnome.org/pub/GNOME/desktop/2.4/2.4.1/sources/gnome-mime-data-2.4.0.tar.bz2; md5 = "b8f1b383a23d734bec8bc33a03cb3690"; }; - stdenv = stdenv; pkgconfig = pkgconfig; perl = perl; } diff --git a/pkgs/development/libraries/gnome/gnome-vfs/builder.sh b/pkgs/development/libraries/gnome/gnome-vfs/builder.sh index 752464fe4ec88..e32024f2d1fd5 100755..100644 --- a/pkgs/development/libraries/gnome/gnome-vfs/builder.sh +++ b/pkgs/development/libraries/gnome/gnome-vfs/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - buildinputs="$pkgconfig $perl $glib $libxml2 $GConf $libbonobo \ $gnomemimedata $popt $bzip2" . $stdenv/setup || exit 1 diff --git a/pkgs/development/libraries/gnome/gnome-vfs/default.nix b/pkgs/development/libraries/gnome/gnome-vfs/default.nix index b2cd632f6ce70..39f0a83bfd43a 100644 --- a/pkgs/development/libraries/gnome/gnome-vfs/default.nix +++ b/pkgs/development/libraries/gnome/gnome-vfs/default.nix @@ -5,15 +5,13 @@ assert pkgconfig != null && perl != null && glib != null && libxml2 != null && GConf != null && libbonobo != null && gnomemimedata != null && bzip2 != null; -derivation { +stdenv.mkDerivation { name = "gnome-vfs-2.4.1"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = ftp://ftp.gnome.org/pub/gnome/sources/gnome-vfs/2.4/gnome-vfs-2.4.1.tar.bz2; md5 = "cb7a36076f6a65e40c7f540be3057310"; }; - stdenv = stdenv; pkgconfig = pkgconfig; perl = perl; glib = glib; diff --git a/pkgs/development/libraries/gnome/libIDL/builder.sh b/pkgs/development/libraries/gnome/libIDL/builder.sh index 113dfef5a64fd..72b9bf8b0f2cc 100755..100644 --- a/pkgs/development/libraries/gnome/libIDL/builder.sh +++ b/pkgs/development/libraries/gnome/libIDL/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - buildinputs="$pkgconfig $glib $lex $yacc" . $stdenv/setup || exit 1 diff --git a/pkgs/development/libraries/gnome/libIDL/default.nix b/pkgs/development/libraries/gnome/libIDL/default.nix index e6ab1cb019b46..9d99b903978d2 100644 --- a/pkgs/development/libraries/gnome/libIDL/default.nix +++ b/pkgs/development/libraries/gnome/libIDL/default.nix @@ -2,15 +2,13 @@ assert pkgconfig != null && glib != null && lex != null && yacc != null; -derivation { +stdenv.mkDerivation { name = "libIDL-0.8.2"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = ftp://ftp.gnome.org/pub/gnome/sources/libIDL/0.8/libIDL-0.8.2.tar.bz2; md5 = "a75d2dbf3a3c66b567047c94245f8b82"; }; - stdenv = stdenv; pkgconfig = pkgconfig; glib = glib; lex = lex; diff --git a/pkgs/development/libraries/gnome/libart_lgpl/builder.sh b/pkgs/development/libraries/gnome/libart_lgpl/builder.sh index 61ebd1faa4ddc..1f4e7265a02da 100755..100644 --- a/pkgs/development/libraries/gnome/libart_lgpl/builder.sh +++ b/pkgs/development/libraries/gnome/libart_lgpl/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - buildinputs="" . $stdenv/setup || exit 1 diff --git a/pkgs/development/libraries/gnome/libart_lgpl/default.nix b/pkgs/development/libraries/gnome/libart_lgpl/default.nix index 9241d3e2b96f1..23bb0d5dea863 100644 --- a/pkgs/development/libraries/gnome/libart_lgpl/default.nix +++ b/pkgs/development/libraries/gnome/libart_lgpl/default.nix @@ -1,12 +1,10 @@ {stdenv, fetchurl}: -derivation { +stdenv.mkDerivation { name = "libart_lgpl-2.3.16"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://ftp.gnome.org/pub/GNOME/desktop/2.4/2.4.1/sources/libart_lgpl-2.3.16.tar.bz2; md5 = "6bb13292b00649d01400a5b29a6c87cb"; }; - stdenv = stdenv; } diff --git a/pkgs/development/libraries/gnome/libbonobo/builder.sh b/pkgs/development/libraries/gnome/libbonobo/builder.sh index eb53f4f9648da..fb6ccb9677f98 100755..100644 --- a/pkgs/development/libraries/gnome/libbonobo/builder.sh +++ b/pkgs/development/libraries/gnome/libbonobo/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh -e - buildinputs="$pkgconfig $perl $ORBit2 $libxml2 $popt $yacc $flex" . $stdenv/setup diff --git a/pkgs/development/libraries/gnome/libbonobo/default.nix b/pkgs/development/libraries/gnome/libbonobo/default.nix index c2a6adb9ecefe..b30a6ad6c84c3 100644 --- a/pkgs/development/libraries/gnome/libbonobo/default.nix +++ b/pkgs/development/libraries/gnome/libbonobo/default.nix @@ -3,15 +3,13 @@ assert pkgconfig != null && perl != null && ORBit2 != null && libxml2 != null && popt != null && yacc != null && flex != null; -derivation { +stdenv.mkDerivation { name = "libbonobo-2.4.2"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = ftp://ftp.gnome.org/pub/gnome/sources/libbonobo/2.4/libbonobo-2.4.2.tar.bz2; md5 = "78200cc6ed588c93f0d29177a5f3e003"; }; - stdenv = stdenv; pkgconfig = pkgconfig; perl = perl; ORBit2 = ORBit2; diff --git a/pkgs/development/libraries/gnome/libbonoboui/builder.sh b/pkgs/development/libraries/gnome/libbonoboui/builder.sh index a014149835036..9f538ee1b873f 100755..100644 --- a/pkgs/development/libraries/gnome/libbonoboui/builder.sh +++ b/pkgs/development/libraries/gnome/libbonoboui/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh -e - buildinputs="$pkgconfig $perl $libxml2 $libglade $libgnome \ $libgnomecanvas" . $stdenv/setup diff --git a/pkgs/development/libraries/gnome/libbonoboui/default.nix b/pkgs/development/libraries/gnome/libbonoboui/default.nix index 3efa13fe151d2..bf700b7567713 100644 --- a/pkgs/development/libraries/gnome/libbonoboui/default.nix +++ b/pkgs/development/libraries/gnome/libbonoboui/default.nix @@ -4,15 +4,13 @@ assert pkgconfig != null && perl != null && libxml2 != null && libglade != null && libgnome != null && libgnomecanvas != null; -derivation { +stdenv.mkDerivation { name = "libbonoboui-2.4.1"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://ftp.gnome.org/pub/GNOME/desktop/2.4/2.4.1/sources/libbonoboui-2.4.1.tar.bz2; md5 = "943a2d0e9fc7b9f0e97ba869de0c5f2a"; }; - stdenv = stdenv; pkgconfig = pkgconfig; perl = perl; libxml2 = libxml2; diff --git a/pkgs/development/libraries/gnome/libglade/builder.sh b/pkgs/development/libraries/gnome/libglade/builder.sh index 9917fd2c5e92c..4c185c4c7a643 100755..100644 --- 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 543586eb20a5f..475bf9c9fa3aa 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; diff --git a/pkgs/development/libraries/gnome/libgnome/builder.sh b/pkgs/development/libraries/gnome/libgnome/builder.sh index 30de2db56cdb3..bd32300351c12 100755..100644 --- a/pkgs/development/libraries/gnome/libgnome/builder.sh +++ b/pkgs/development/libraries/gnome/libgnome/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh -e - buildinputs="$pkgconfig $perl $glib $gnomevfs $libbonobo $GConf \ $popt $zlib" . $stdenv/setup diff --git a/pkgs/development/libraries/gnome/libgnome/default.nix b/pkgs/development/libraries/gnome/libgnome/default.nix index d33a54cf7a285..ac4a61365e881 100644 --- a/pkgs/development/libraries/gnome/libgnome/default.nix +++ b/pkgs/development/libraries/gnome/libgnome/default.nix @@ -10,15 +10,13 @@ assert pkgconfig != null && perl != null && glib != null # "WARNING: failed to install schema `/schemas/desktop/gnome/url-handlers/https/need-terminal' locale `is': Failed: # Failed to create file `/nix/store/14d4fc76451786eba9dea087d56dc719-GConf-2.4.0/etc/gconf/gconf.xml.defaults/%gconf.xml': Permission denied" -derivation { +stdenv.mkDerivation { name = "libgnome-2.0.6"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = ftp://ftp.gnome.org/pub/gnome/sources/libgnome/2.4/libgnome-2.4.0.tar.bz2; md5 = "caec1e12d64b98a2925a4317ac16429f"; }; - stdenv = stdenv; pkgconfig = pkgconfig; perl = perl; glib = glib; diff --git a/pkgs/development/libraries/gnome/libgnomecanvas/builder.sh b/pkgs/development/libraries/gnome/libgnomecanvas/builder.sh index 550ee65a8d0ab..c7eddf4ffa91d 100755..100644 --- a/pkgs/development/libraries/gnome/libgnomecanvas/builder.sh +++ b/pkgs/development/libraries/gnome/libgnomecanvas/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh -e - buildinputs="$pkgconfig $gtk $libart $libglade" . $stdenv/setup diff --git a/pkgs/development/libraries/gnome/libgnomecanvas/default.nix b/pkgs/development/libraries/gnome/libgnomecanvas/default.nix index fef31114b1b8e..878a5936a3cf4 100644 --- a/pkgs/development/libraries/gnome/libgnomecanvas/default.nix +++ b/pkgs/development/libraries/gnome/libgnomecanvas/default.nix @@ -3,15 +3,13 @@ assert pkgconfig != null && gtk != null && libart != null && libglade != null; -derivation { +stdenv.mkDerivation { name = "libgnomecanvas-2.4.0"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://ftp.gnome.org/pub/GNOME/desktop/2.4/2.4.1/sources/libgnomecanvas-2.4.0.tar.bz2; md5 = "c212a7cac06b7f9e68ed2de38df6e54d"; }; - stdenv = stdenv; pkgconfig = pkgconfig; gtk = gtk; libart = libart; diff --git a/pkgs/development/libraries/gnome/libgnomeui/builder.sh b/pkgs/development/libraries/gnome/libgnomeui/builder.sh index 23711d9ea6f5b..c0ccfec36ef43 100755..100644 --- a/pkgs/development/libraries/gnome/libgnomeui/builder.sh +++ b/pkgs/development/libraries/gnome/libgnomeui/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh -e - buildinputs="$pkgconfig $libgnome $libgnomecanvas $libbonoboui $libglade" . $stdenv/setup diff --git a/pkgs/development/libraries/gnome/libgnomeui/default.nix b/pkgs/development/libraries/gnome/libgnomeui/default.nix index 9a97d7697a951..a44d8bb6a99d8 100644 --- a/pkgs/development/libraries/gnome/libgnomeui/default.nix +++ b/pkgs/development/libraries/gnome/libgnomeui/default.nix @@ -3,15 +3,13 @@ assert pkgconfig != null && libgnome != null && libgnomecanvas != null && libbonoboui != null && libglade != null; -derivation { +stdenv.mkDerivation { name = "libgnomeui-2.4.0.1"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://ftp.gnome.org/pub/GNOME/desktop/2.4/2.4.1/sources/libgnomeui-2.4.0.1.tar.bz2; md5 = "196f4a3f1f4a531ff57acaa879e98dd2"; }; - stdenv = stdenv; pkgconfig = pkgconfig; libgnome = libgnome; libgnomecanvas = libgnomecanvas; |