ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

* Fixed and/or updated some more components. The number of explicit

Browse Source 
builders is dropping steadily.

svn path=/nixpkgs/trunk/; revision=900
This commit is contained in:
Eelco Dolstra 2004-04-01 19:11:59 +00:00
parent 7bf54b734e
commit 776554d9e1
37 changed files with 50 additions and 306 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/graphics/gqview/builder.sh
View File

@ -1,8 +0,0 @@
buildinputs="$pkgconfig $gtk $libpng"
. $stdenv/setup || exit 1
tar xvfz $src || exit 1
cd gqview-* || exit 1
./configure --prefix=$out || exit 1
make || exit 1
make install || exit 1

13
pkgs/applications/graphics/gqview/default.nix
View File

@ -3,18 +3,15 @@
assert pkgconfig != null && gtk != null && libpng != null;
# Note that we cannot just copy gtk's png attribute, since gtk might
# not be linked against png.
assert libpng == gtk.libpng;
# !!! assert libpng == gtk.libpng;
stdenv.mkDerivation {
name = "gqview-1.3.5";
name = "gqview-1.4.1";
builder = ./builder.sh;
src = fetchurl {
url = http://heanet.dl.sourceforge.net/sourceforge/gqview/gqview-1.3.5.tar.gz;
md5 = "c44687bdd636ea6e5133fb936abf880a";
url = http://heanet.dl.sourceforge.net/sourceforge/gqview/gqview-1.4.1.tar.gz;
md5 = "d963fbb878d78e8ebf78ea8c18caa72f";
};
pkgconfig = pkgconfig;
gtk = gtk;
libpng = libpng;
buildInputs = [pkgconfig gtk libpng];
}

18
pkgs/applications/video/zapping/builder.sh
View File

@ -1,16 +1,6 @@
buildinputs="$pkgconfig $perl $python $x11 $libgnomeui \
$libglade $scrollkeeper $esound $gettext $zvbi $libjpeg $libpng"
. $stdenv/setup || exit 1
. $stdenv/setup
# !!! hack; this is because $linuxHeaders/config.h includes some
# file autoconf.h. What is that?
export NIX_CFLAGS_COMPILE="-D_LINUX_CONFIG_H $NIX_CFLAGS_COMPILE"
# !!! hack - `make install' tries to setuid to root
installFlags="ZSFB_OWNER=`id -u` ZSFB_GROUP=`id -g`"
# Bug: esound is not added to LDFLAGS, and libtool then picks it up from /usr!
tar xvfj $src || exit 1
cd zapping-* || exit 1
LDFLAGS="-L$esound/lib" ./configure --prefix=$out || exit 1
make || exit 1
# !!! hack - it tries to setuid to root
make install ZSFB_OWNER=`id -u` ZSFB_GROUP=`id -g` || exit 1
genericBuild

25
pkgs/applications/video/zapping/default.nix
View File

@ -10,7 +10,7 @@ assert pkgconfig != null && perl != null && python != null &&
scrollkeeper != null && esound != null && gettext != null;
assert teletextSupport -> zvbi != null && zvbi.pngSupport
&& pngSupport && zvbi.libpng == libpng;
/* !!! && pngSupport && zvbi.libpng == libpng */;
assert jpegSupport -> libjpeg != null;
assert pngSupport -> libpng != null;
@ -24,20 +24,13 @@ stdenv.mkDerivation {
md5 = "cdedc0088c70f4520c37066ec05cb996";
};
teletextSupport = teletextSupport;
jpegSupport = jpegSupport;
pngSupport = pngSupport;
inherit teletextSupport jpegSupport pngSupport;
pkgconfig = pkgconfig;
perl = perl;
python = python;
x11 = x11;
libgnomeui = libgnomeui;
libglade = libglade;
scrollkeeper = scrollkeeper;
esound = esound;
gettext = gettext;
zvbi = if teletextSupport then zvbi else null;
libjpeg = if jpegSupport then libjpeg else null;
libpng = if pngSupport then libpng else null;
buildInputs = [
pkgconfig perl python x11 libgnomeui
libglade scrollkeeper esound gettext
(if teletextSupport then zvbi else null)
(if jpegSupport then libjpeg else null)
(if pngSupport then libpng else null)
];
}

12
pkgs/development/libraries/gnome/GConf/builder.sh
View File

@ -1,12 +0,0 @@
buildinputs="$pkgconfig $perl $glib $gtk $libxml2 $ORBit2 $popt"
. $stdenv/setup
tar xvfj $src
cd GConf-*
./configure --prefix=$out
make
make install
strip -S $out/lib/*.a
mkdir $out/nix-support
echo "$ORBit2" > $out/nix-support/propagated-build-inputs

11
pkgs/development/libraries/gnome/GConf/default.nix
View File

@ -6,16 +6,11 @@ assert pkgconfig != null && perl != null
stdenv.mkDerivation {
name = "GConf-2.4.0.1";
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";
};
pkgconfig = pkgconfig;
perl = perl; # Perl is not `supposed' to be required, but it is.
glib = glib;
gtk = gtk;
libxml2 = libxml2;
ORBit2 = ORBit2;
popt = popt;
# Perl is not `supposed' to be required, but it is.
buildInputs = [pkgconfig perl glib gtk libxml2 popt];
propagatedBuildInputs = [ORBit2];
}

12
pkgs/development/libraries/gnome/ORBit2/builder.sh
View File

@ -1,12 +0,0 @@
buildinputs="$pkgconfig $glib $libIDL $popt"
. $stdenv/setup
tar xvfj $src
cd ORBit2-*
./configure --prefix=$out
make
make install
strip -S $out/lib/*.a
mkdir $out/nix-support
echo "$glib" > $out/nix-support/propagated-build-inputs

7
pkgs/development/libraries/gnome/ORBit2/default.nix
View File

@ -5,13 +5,10 @@ assert pkgconfig != null && glib != null && libIDL != null
stdenv.mkDerivation {
name = "ORBit2-2.8.3";
builder = ./builder.sh;
src = fetchurl {
url = ftp://ftp.gnome.org/pub/gnome/sources/ORBit2/2.8/ORBit2-2.8.3.tar.bz2;
md5 = "c6c4b63de2f70310e33a52a37257ddaf";
};
pkgconfig = pkgconfig;
glib = glib;
libIDL = libIDL;
popt = popt;
buildInputs = [pkgconfig libIDL popt];
propagatedBuildInputs = [glib];
}

12
pkgs/development/libraries/gnome/esound/builder.sh
View File

@ -1,12 +0,0 @@
buildinputs="$audiofile"
. $stdenv/setup
tar xvfj $src
cd esound-*
./configure --prefix=$out
make
make install
strip -S $out/lib/*.a
mkdir $out/nix-support
echo "$audiofile" > $out/nix-support/propagated-build-inputs

3
pkgs/development/libraries/gnome/esound/default.nix
View File

@ -4,10 +4,9 @@ assert audiofile != null;
stdenv.mkDerivation {
name = "esound-0.2.32";
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";
};
audiofile = audiofile;
propagatedBuildInputs = [audiofile];
}

8
pkgs/development/libraries/gnome/gnome-mime-data/builder.sh
View File

@ -1,8 +0,0 @@
buildinputs="$pkgconfig $perl"
. $stdenv/setup || exit 1
tar xvfj $src || exit 1
cd gnome-mime-data-* || exit 1
./configure --prefix=$out || exit 1
make || exit 1
make install || exit 1

4
pkgs/development/libraries/gnome/gnome-mime-data/default.nix
View File

@ -4,11 +4,9 @@ assert pkgconfig != null && perl != null;
stdenv.mkDerivation {
name = "gnome-mime-data-2.4.0";
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";
};
pkgconfig = pkgconfig;
perl = perl;
buildInputs = [pkgconfig perl];
}

10
pkgs/development/libraries/gnome/gnome-vfs/builder.sh
View File

@ -1,10 +0,0 @@
buildinputs="$pkgconfig $perl $glib $libxml2 $GConf $libbonobo \
$gnomemimedata $popt $bzip2"
. $stdenv/setup || exit 1
tar xvfj $src || exit 1
cd gnome-vfs-* || exit 1
./configure --prefix=$out || exit 1
make || exit 1
make install || exit 1
strip -S $out/lib/*.a || exit 1

11
pkgs/development/libraries/gnome/gnome-vfs/default.nix
View File

@ -7,18 +7,9 @@ assert pkgconfig != null && perl != null && glib != null
stdenv.mkDerivation {
name = "gnome-vfs-2.4.1";
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";
};
pkgconfig = pkgconfig;
perl = perl;
glib = glib;
libxml2 = libxml2;
GConf = GConf;
libbonobo = libbonobo;
gnomemimedata = gnomemimedata;
popt = popt;
bzip2 = bzip2;
buildInputs = [pkgconfig perl glib libxml2 GConf libbonobo gnomemimedata popt bzip2];
}

9
pkgs/development/libraries/gnome/libIDL/builder.sh
View File

@ -1,9 +0,0 @@
buildinputs="$pkgconfig $glib $lex $yacc"
. $stdenv/setup || exit 1
tar xvfj $src || exit 1
cd libIDL-* || exit 1
./configure --prefix=$out || exit 1
make || exit 1
make install || exit 1
strip -S $out/lib/*.a || exit 1

6
pkgs/development/libraries/gnome/libIDL/default.nix
View File

@ -4,13 +4,9 @@ assert pkgconfig != null && glib != null && lex != null && yacc != null;
stdenv.mkDerivation {
name = "libIDL-0.8.2";
builder = ./builder.sh;
src = fetchurl {
url = ftp://ftp.gnome.org/pub/gnome/sources/libIDL/0.8/libIDL-0.8.2.tar.bz2;
md5 = "a75d2dbf3a3c66b567047c94245f8b82";
};
pkgconfig = pkgconfig;
glib = glib;
lex = lex;
yacc = yacc;
buildInputs = [pkgconfig glib lex yacc];
}

9
pkgs/development/libraries/gnome/libart_lgpl/builder.sh
View File

@ -1,9 +0,0 @@
buildinputs=""
. $stdenv/setup || exit 1
tar xvfj $src || exit 1
cd libart_lgpl-* || exit 1
./configure --prefix=$out || exit 1
make || exit 1
make install || exit 1
strip -S $out/lib/*.a || exit 1

1
pkgs/development/libraries/gnome/libart_lgpl/default.nix
View File

@ -2,7 +2,6 @@
stdenv.mkDerivation {
name = "libart_lgpl-2.3.16";
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";

12
pkgs/development/libraries/gnome/libbonobo/builder.sh
View File

@ -1,12 +0,0 @@
buildinputs="$pkgconfig $perl $ORBit2 $libxml2 $popt $yacc $flex"
. $stdenv/setup
tar xvfj $src
cd libbonobo-*
./configure --prefix=$out
make
make install
strip -S $out/lib/*.a
mkdir $out/nix-support
echo "$ORBit2 $popt" > $out/nix-support/propagated-build-inputs

10
pkgs/development/libraries/gnome/libbonobo/default.nix
View File

@ -5,16 +5,10 @@ assert pkgconfig != null && perl != null && ORBit2 != null
stdenv.mkDerivation {
name = "libbonobo-2.4.2";
builder = ./builder.sh;
src = fetchurl {
url = ftp://ftp.gnome.org/pub/gnome/sources/libbonobo/2.4/libbonobo-2.4.2.tar.bz2;
md5 = "78200cc6ed588c93f0d29177a5f3e003";
};
pkgconfig = pkgconfig;
perl = perl;
ORBit2 = ORBit2;
libxml2 = libxml2;
popt = popt;
yacc = yacc;
flex = flex;
buildInputs = [pkgconfig perl libxml2 yacc flex];
propagatedBuildInputs = [ORBit2 popt];
}

13
pkgs/development/libraries/gnome/libbonoboui/builder.sh
View File

@ -1,13 +0,0 @@
buildinputs="$pkgconfig $perl $libxml2 $libglade $libgnome \
$libgnomecanvas"
. $stdenv/setup
tar xvfj $src
cd libbonoboui-*
./configure --prefix=$out
make
make install
strip -S $out/lib/*.a
mkdir $out/nix-support
echo "$libxml2 $libgnome $libgnomecanvas" > $out/nix-support/propagated-build-inputs

9
pkgs/development/libraries/gnome/libbonoboui/default.nix
View File

@ -6,15 +6,10 @@ assert pkgconfig != null && perl != null && libxml2 != null
stdenv.mkDerivation {
name = "libbonoboui-2.4.1";
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";
};
pkgconfig = pkgconfig;
perl = perl;
libxml2 = libxml2;
libglade = libglade;
libgnome = libgnome;
libgnomecanvas = libgnomecanvas;
buildInputs = [pkgconfig perl libglade];
propagatedBuildInputs = [libxml2 libgnome libgnomecanvas];
}

12
pkgs/development/libraries/gnome/libglade/builder.sh
View File

@ -1,12 +0,0 @@
buildinputs="$pkgconfig $gtk $libxml2"
. $stdenv/setup
tar xvfj $src
cd libglade-*
./configure --prefix=$out
make
make install
strip -S $out/lib/*.a
mkdir $out/nix-support
echo "$gtk $libxml2" > $out/nix-support/propagated-build-inputs

6
pkgs/development/libraries/gnome/libglade/default.nix
View File

@ -4,12 +4,10 @@ assert pkgconfig != null && gtk != null && libxml2 != null;
stdenv.mkDerivation {
name = "libglade-2.0.1";
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";
};
pkgconfig = pkgconfig;
gtk = gtk;
libxml2 = libxml2;
buildInputs = [pkgconfig];
propagatedBuildInputs = [gtk libxml2];
}

13
pkgs/development/libraries/gnome/libgnome/builder.sh
View File

@ -1,13 +0,0 @@
buildinputs="$pkgconfig $perl $glib $gnomevfs $libbonobo $GConf \
$popt $zlib"
. $stdenv/setup
tar xvfj $src
cd libgnome-*
./configure --prefix=$out
make
make install
strip -S $out/lib/*.a
mkdir $out/nix-support
echo "$glib $gnomevfs $libbonobo $GConf" > $out/nix-support/propagated-build-inputs

11
pkgs/development/libraries/gnome/libgnome/default.nix
View File

@ -12,17 +12,10 @@ assert pkgconfig != null && perl != null && glib != null
stdenv.mkDerivation {
name = "libgnome-2.0.6";
builder = ./builder.sh;
src = fetchurl {
url = ftp://ftp.gnome.org/pub/gnome/sources/libgnome/2.4/libgnome-2.4.0.tar.bz2;
md5 = "caec1e12d64b98a2925a4317ac16429f";
};
pkgconfig = pkgconfig;
perl = perl;
glib = glib;
gnomevfs = gnomevfs;
libbonobo = libbonobo;
GConf = GConf;
popt = popt;
zlib = zlib;
buildInputs = [pkgconfig perl popt zlib];
propagatedBuildInputs = [glib gnomevfs libbonobo GConf];
}

12
pkgs/development/libraries/gnome/libgnomecanvas/builder.sh
View File

@ -1,12 +0,0 @@
buildinputs="$pkgconfig $gtk $libart $libglade"
. $stdenv/setup
tar xvfj $src
cd libgnomecanvas-*
./configure --prefix=$out
make
make install
strip -S $out/lib/*.a
mkdir $out/nix-support
echo "$gtk $libart" > $out/nix-support/propagated-build-inputs

7
pkgs/development/libraries/gnome/libgnomecanvas/default.nix
View File

@ -5,13 +5,10 @@ assert pkgconfig != null && gtk != null && libart != null
stdenv.mkDerivation {
name = "libgnomecanvas-2.4.0";
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";
};
pkgconfig = pkgconfig;
gtk = gtk;
libart = libart;
libglade = libglade;
buildInputs = [pkgconfig libglade];
propagatedBuildInputs = [gtk libart];
}

12
pkgs/development/libraries/gnome/libgnomeui/builder.sh
View File

@ -1,12 +0,0 @@
buildinputs="$pkgconfig $libgnome $libgnomecanvas $libbonoboui $libglade"
. $stdenv/setup
tar xvfj $src
cd libgnomeui-*
./configure --prefix=$out
make
make install
strip -S $out/lib/*.a $out/lib/libglade/*/*.a
mkdir $out/nix-support
echo "$libgnome $libgnomecanvas $libbonoboui" > $out/nix-support/propagated-build-inputs

8
pkgs/development/libraries/gnome/libgnomeui/default.nix
View File

@ -5,14 +5,10 @@ assert pkgconfig != null && libgnome != null && libgnomecanvas != null
stdenv.mkDerivation {
name = "libgnomeui-2.4.0.1";
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";
};
pkgconfig = pkgconfig;
libgnome = libgnome;
libgnomecanvas = libgnomecanvas;
libbonoboui = libbonoboui;
libglade = libglade;
buildInputs = [pkgconfig libglade];
propagatedBuildInputs = [libgnome libgnomecanvas libbonoboui];
}

14
pkgs/development/libraries/scrollkeeper/builder.sh
View File

@ -1,13 +1,7 @@
buildinputs="$perl $libxml2 $libxslt"
. $stdenv/setup || exit 1
. $stdenv/setup
export PERL5LIB=$perlXMLParser/lib/site_perl:$PERL5LIB
tar xvfz $src || exit 1
cd scrollkeeper-* || exit 1
./configure --prefix=$out \
--with-xml-catalog=$docbook_xml_dtd/xml/dtd/docbook/docbook.cat \
|| exit 1
make || exit 1
make install || exit 1
strip -S $out/lib/*.a || exit 1
configureFlags="--with-xml-catalog=$docbook_xml_dtd/xml/dtd/docbook/docbook.cat"
genericBuild

7
pkgs/development/libraries/scrollkeeper/default.nix
View File

@ -13,9 +13,6 @@ stdenv.mkDerivation {
url = http://heanet.dl.sourceforge.net/sourceforge/scrollkeeper/scrollkeeper-0.3.14.tar.gz;
md5 = "161eb3f29e30e7b24f84eb93ac696155";
};
perl = perl;
libxml2 = libxml2;
libxslt = libxslt;
docbook_xml_dtd = docbook_xml_dtd;
perlXMLParser = perlXMLParser;
buildInputs = [perl libxml2 libxslt];
inherit docbook_xml_dtd perlXMLParser;
}

9
pkgs/development/libraries/zvbi/builder.sh
View File

@ -1,9 +0,0 @@
buildinputs="$x11 $libpng"
. $stdenv/setup || exit 1
tar xvfj $src || exit 1
cd zvbi-* || exit 1
./configure --prefix=$out || exit 1
make || exit 1
make install || exit 1
strip -S $out/lib/*.a || exit 1

6
pkgs/development/libraries/zvbi/default.nix
View File

@ -6,12 +6,10 @@ assert pngSupport -> libpng != null;
stdenv.mkDerivation {
name = "zvbi-0.2.5";
builder = ./builder.sh;
src = fetchurl {
url = http://heanet.dl.sourceforge.net/sourceforge/zapping/zvbi-0.2.5.tar.bz2;
md5 = "06b370565246758813f6580797369518";
};
x11 = x11;
pngSupport = pngSupport;
libpng = if pngSupport then libpng else null;
buildInputs = [x11 (if pngSupport then libpng else null)];
inherit pngSupport;
}

11
pkgs/development/tools/misc/valgrind/builder.sh
View File

@ -1,11 +0,0 @@
. $stdenv/setup || exit 1
# !!! hack; this is because $linuxHeaders/config.h includes some
# file autoconf.h. What is that?
export NIX_CFLAGS_COMPILE="-D_LINUX_CONFIG_H $NIX_CFLAGS_COMPILE"
tar xvfj $src || exit 1
cd valgrind-* || exit 1
./configure --prefix=$out || exit 1
make || exit 1
make install || exit 1

3
pkgs/development/tools/misc/valgrind/default.nix
View File

@ -2,9 +2,10 @@
stdenv.mkDerivation {
name = "valgrind-2.1.0";
builder = ./builder.sh;
src = fetchurl {
url = http://developer.kde.org/~sewardj/valgrind-2.1.0.tar.bz2;
md5 = "3e4056dd45163a5f555a23ced2f95191";
# url = http://developer.kde.org/~sewardj/valgrind-2.1.1.tar.bz2;
# md5 = "0010c3e8f054ecc633151c62044b646d";
};
}

2
pkgs/system/populate-cache.nix
View File

@ -46,7 +46,7 @@ let {
pkgs.MPlayerPlugin
# pkgs.vlc
pkgs.zapping
# pkgs.gqview
pkgs.gqview
pkgs.hello
pkgs.nxml
pkgs.uml