* Merged most of the stdenv-updates branch. Some stuff didn't

merge cleanly right away (kde-4, kernel stuff) so it should be
  merged later.  But the stdenv stuff is all there.

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10793
This commit is contained in:
211 changed files with 1399 additions and 4020 deletions

View File

@ -55,6 +55,8 @@ args.stdenv.mkDerivation {
preBuild="touch src/auto/link.sed";
configureFlags = args.lib.condConcat "" configFlags check;
NIX_LDFLAGS = "-lpthread -lutil";
meta = {
description = "The most popular clone of the VI editor";
homepage = http://www.vim.org;

View File

@ -1,10 +1,10 @@
args: with args;
(stdenv.mkDerivation (rec {
name = "ImageMagick-6.3.7-10";
stdenv.mkDerivation (rec {
name = "ImageMagick-6.3.8-5";
src = fetchurl {
url = "mirror://imagemagick/" + name + ".tar.bz2";
sha256 = "c00fb0d21baa292a55bb0e30ca30ffe2571e0d3df9e692da441aa81ff1cdde10";
url = "ftp://ftp.imagemagick.org/pub/ImageMagick/${name}.tar.bz2";
sha256 = "0lsvi2z5b5zam6yvjzsyjpa36rg1c0kczifz73k9b4v8zz9a9vfl";
};
configureFlags = " --with-dots --with-gs-font-dir="+ ghostscript +
@ -17,13 +17,10 @@ args: with args;
++ (if args ? librsvg then [args.librsvg] else []);
meta = {
description = ''ImageMagick(R) is a software suite to create, edit, and compose bitmap
images. It can read, convert and write images in a variety of
formats (over 100).'';
homepage = http://www.imagemagick.org;
};
} // (if args ? tetex then {
preConfigure = "
export DVIDecodeDelegate=${args.tetex}/bin/dvips
";
} else {})))
} else {}))

View File

@ -1,37 +1,16 @@
{ stdenv, fetchurl, pkgconfig,
perl, perlXMLParser,
gtk, libXft, fontconfig,
libpng, lcms,
zlib, popt,
boehmgc,
libxml2, libxslt,
glib,
gtkmm, glibmm, libsigcxx,
boost,
gettext
}:
args: with args;
stdenv.mkDerivation {
name = "inkscape-0.45";
stdenv.mkDerivation rec {
name = "inkscape-0.45.1";
src = fetchurl {
url = mirror://sourceforge/inkscape/inkscape-0.45.1.tar.gz;
url = "mirror://sf/inkscape/${name}.tar.gz";
sha256 = "1y0b9bm8chn6a2ip99dj4dhg0188yn67v571ha0x38wrlmvn4k0d";
};
buildInputs = [
pkgconfig
perl perlXMLParser
gtk libXft fontconfig
libpng
zlib popt
boehmgc
libxml2 libxslt
glib
gtkmm glibmm libsigcxx
lcms
boost
gettext
pkgconfig perl perlXMLParser gtk libXft fontconfig libpng zlib popt boehmgc
libxml2 libxslt glib gtkmm glibmm libsigcxx lcms boost gettext
];
meta = {

View File

@ -4,6 +4,6 @@ build-essential libxcomposite-dev libpng12-dev libsm-dev libxrandr-dev libxdamag
args: with args;
[
libpng
GConf mesa metacity librsvg dbus dbus_glib gnomedesktop git autoconf automake
GConf mesa metacity librsvg dbus.libs dbus_glib gnomedesktop git autoconf automake
libtool libxslt libwnck intltool perl perlXMLParser compiz
]

View File

@ -14,7 +14,7 @@ args : with args;
propagatedBuildInputs = [
libpng libXcomposite libXfixes libXdamage libXrandr libXinerama
libICE libSM startupnotification mesa GConf perl perlXMLParser libxslt
dbus dbus_glib compositeproto fixesproto damageproto randrproto
dbus.libs dbus_glib compositeproto fixesproto damageproto randrproto
xineramaproto renderproto kbproto xextproto libXrender
];
configureFlags = ["--enable-gtk" "--enable-fuse"

View File

@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "7fc7faafccfdf22dea7ac1de6629dcb55ec63d84fcb57a14559309cf284fa94f";
};
buildInputs = [
pkgconfig compiz perl perlXMLParser GConf dbus gtk
pkgconfig compiz perl perlXMLParser GConf dbus.libs gtk
];
preBuild = "
makeFlagsArray=(moduledir=$out/lib/compiz)

View File

@ -50,14 +50,17 @@ fi
doSubstitute() {
local src=$1
local dst=$2
substitute "$src" "$dst" \
--subst-var "out" \
--subst-var "shell" \
--subst-var "gcc" \
--subst-var "gccProg" \
--subst-var "binutils" \
--subst-var "libc" \
--subst-var-by "ld" "$ldPath/ld"
# Can't use substitute() here, because replace may not have been
# built yet (in the bootstrap).
sed \
-e "s^@out@^$out^g" \
-e "s^@shell@^$shell^g" \
-e "s^@gcc@^$gcc^g" \
-e "s^@gccProg@^$gccProg^g" \
-e "s^@binutils@^$binutils^g" \
-e "s^@libc@^$libc^g" \
-e "s^@ld@^$ldPath/ld^g" \
< "$src" > "$dst"
}
@ -108,3 +111,11 @@ doSubstitute "$addFlags" "$out/nix-support/add-flags.sh"
doSubstitute "$setupHook" "$out/nix-support/setup-hook"
cp -p $utils $out/nix-support/utils.sh
# Propagate the wrapped gcc so that if you install the wrapper, you get
# tools like gcov, the manpages, etc. as well (including for binutils
# and Glibc).
if test -z "$nativeTools"; then
echo $gcc $binutils $libc > $out/nix-support/propagated-user-env-packages
fi

View File

@ -6,6 +6,8 @@ stdenv.mkDerivation {
url = http://download.savannah.gnu.org/releases/freefont/freefont-ttf-20060126.tar.gz;
md5 = "822aba4e2ed065d9d3ded6e26e495854";
};
buildPhase = "true";
installPhase = "ensureDir $out/share/fonts/truetype; cp *.ttf $out/share/fonts/truetype";
installPhase = ''
ensureDir $out/share/fonts/truetype
cp *.ttf $out/share/fonts/truetype
'';
}

View File

@ -0,0 +1,2 @@
args:
import ./common.nix "1chz63v9jr009z9jhs07klybmhyf58i8vxipigf5gkdabjiclcyr" args

View File

@ -0,0 +1,2 @@
args:
import ./common.nix "080ny2vy00202hxcm7xm72j1zmyfs15dbsnqipwni6b2dg2am3q3" args

View File

@ -0,0 +1,16 @@
hash: args: with args;
stdenv.mkDerivation rec {
name = "shared-mime-info-" + version;
src = fetchurl {
url = "http://freedesktop.org/~hadess/${name}.tar.bz2";
sha256 = hash;
};
buildInputs = [perl perlXMLParser pkgconfig gettext libxml2 glib];
meta = {
homepage = http://freedesktop.org/wiki/Software/shared-mime-info;
};
}

View File

@ -1,12 +0,0 @@
{stdenv, fetchurl, perl, perlXMLParser, pkgconfig, gettext, libxml2, glib}:
stdenv.mkDerivation {
name = "shared-mime-info-0.22";
src = fetchurl {
url = http://freedesktop.org/~hadess/shared-mime-info-0.22.tar.bz2;
sha256 = "1chz63v9jr009z9jhs07klybmhyf58i8vxipigf5gkdabjiclcyr";
};
buildInputs = [perl perlXMLParser pkgconfig gettext libxml2 glib];
}

View File

@ -1,12 +1,6 @@
# todo audiofile is also part of the gnome platform. Move it to this collection?
{ stdenv, fetchurl, pkgconfig, audiofile
, flex, bison, popt, perl, zlib, libxml2, libxslt
, perlXMLParser, docbook_xml_dtd_42, docbook_xml_dtd_412
, gettext, x11, libtiff, libjpeg
, libpng, gtkLibs, xlibs, bzip2, libcm, python, dbus_glib, ncurses
, which, libxml2Python, iconnamingutils
}:
args: with args;
assert dbus_glib.glib == gtkLibs.glib;
@ -57,7 +51,7 @@ rec {
gnomevfs = import ./gnome-vfs.nix {
inherit fetchurl stdenv gnome pkgconfig perl libxml2 popt
perlXMLParser gettext bzip2 dbus_glib;
perlXMLParser gettext bzip2 dbus_glib openssl hal samba fam;
input = platform.gnomevfs;
};

View File

@ -1,14 +1,11 @@
{ input, stdenv, fetchurl, gnome, pkgconfig, perl, libxml2
, popt, perlXMLParser, gettext, bzip2, dbus_glib
}:
args: with args;
stdenv.mkDerivation {
inherit (input) name src;
buildInputs = [
pkgconfig perl gnome.glib libxml2 gnome.GConf gnome.libbonobo
gnome.gnomemimedata popt perlXMLParser gettext bzip2
dbus_glib
dbus_glib hal openssl samba fam
];
patches = [./no-kerberos.patch];
configureFlags = "--disable-hal";
}

View File

@ -2,12 +2,6 @@ args: with args;
stdenv.mkDerivation {
name = "akode-2.0.0dev";
src = fetchsvn {
url = svn://anonsvn.kde.org/home/kde/trunk/kdesupport/akode;
rev = 732646;
md5 = "6629ffedc42c020d2e8645910a4efdf5";
};
src = svnSrc "akode" "0xkzv386wvh16njjv8z84mg3czp7j7n60lwhwns5fwqhx1s30h5y";
buildInputs = [ cmake qt openssl gettext cyrus_sasl alsaLib ];
}

View File

@ -1,36 +1,22 @@
args:
oldArgs:
let
args = oldArgs // {
svnSrc = name: hash:
oldArgs.fetchsvn {
url = "svn://anonsvn.kde.org/home/kde/trunk/kdesupport/${name}";
rev = 747269;
sha256 = hash;
};
};
in
rec {
qca = (import ./qca.nix) args;
akode = (import ./akode.nix) args;
gmm = (import ./gmm.nix) args;
eigen = (import ./eigen.nix) args;
taglib = (import ./taglib.nix) args;
gmm = (import ./gmm.nix) args;
qca = (import ./qca.nix) args;
qimageblitz = (import ./qimageblitz.nix) args;
soprano = (import ./soprano.nix) args;
strigi = (import ./strigi.nix) args;
qimageblitz = (import ./qimageblitz.nix) args;
taglib = (import ./taglib.nix) args;
all = [qca gmm eigen taglib soprano strigi qimageblitz];
}
#args: with args;
#
#stdenv.mkDerivation {
# name = "kdesupport-4.0svn-r729462";
#
# src = fetchsvn {
# url = svn://anonsvn.kde.org/home/kde/trunk/kdesupport;
# rev = 729462;
# md5 = "aa50ec8e5c8d49e1dfd53143345cb4b3";
# };
#
# propagatedBuildInputs = [
# exiv2
# cmake inputproto kbproto scrnsaverproto xextproto xf86miscproto xf86vidmodeproto
# xineramaproto xproto libICE libX11 libXau libXcomposite libXcursor
# libXdamage libXdmcp libXext libXfixes libXft libXi libXpm libXrandr
# libXrender libXScrnSaver libXt libXtst libXv libXxf86misc libxkbfile zlib
# perl qt openssl pcre pkgconfig libjpeg libpng libtiff libxml2 libxslt expat
# libtool freetype bzip2 shared_mime_info alsaLib libungif cups
# gettext cluceneCore redland stdenv.gcc.libc dbus bison cppunit
# ];
# CLUCENE_HOME=cluceneCore;
# patchPhase = "sed -e '/set(qca_PLUGINSDIR/s@\${QT_PLUGINS_DIR}@\${CMAKE_INSTALL_PREFIX}/plugins@' -i ../qca/CMakeLists.txt";
#}

View File

@ -2,12 +2,6 @@ args: with args;
stdenv.mkDerivation {
name = "eigen-1.0.5";
src = fetchsvn {
url = svn://anonsvn.kde.org/home/kde/trunk/kdesupport/eigen;
rev = 732646;
md5 = "f91ad5d3dd992984fb61107fd9050a36";
};
src = svnSrc "eigen" "0dr2gzrf17bdgxj4f9ibk7x5j7fqwwjsl800dzfvrhgj6v1mxm4x";
buildInputs = [ cmake ];
}

View File

@ -2,12 +2,6 @@ args: with args;
stdenv.mkDerivation {
name = "gmm-svn";
src = fetchsvn {
url = svn://anonsvn.kde.org/home/kde/trunk/kdesupport/gmm;
rev = 732646;
md5 = "09ee4cfcbb3c428bc681c2da022648bf";
};
src = svnSrc "gmm" "0qvx9jf17z0mpwy8k6w6bla94gkkslkiv5w98aajfcq34n0zxcpc";
buildInputs = [ cmake ];
}

View File

@ -2,14 +2,7 @@ args: with args;
stdenv.mkDerivation {
name = "qca-2.0.0dev";
src = fetchsvn {
url = svn://anonsvn.kde.org/home/kde/trunk/kdesupport/qca;
rev = 732646;
md5 = "1df54bf3bf327b14ea1948f9080717c3";
};
src = svnSrc "qca" "0dycmk8fn57mz2pfxck6d0g833fqg9zrw17789vxb4ks0xz0p3zp";
buildInputs = [ cmake qt openssl gettext cyrus_sasl libgcrypt gnupg ];
patchPhase = "sed -e '/set(qca_PLUGINSDIR/s@\${QT_PLUGINS_DIR}@\${CMAKE_INSTALL_PREFIX}/plugins@' -i ../CMakeLists.txt";
}

View File

@ -2,12 +2,6 @@ args: with args;
stdenv.mkDerivation {
name = "qimageblitz-4.0.0svn";
src = fetchsvn {
url = svn://anonsvn.kde.org/home/kde/trunk/kdesupport/qimageblitz;
rev = 732646;
md5 = "c37fa505368071ec501e966225e30c78";
};
src = svnSrc "qimageblitz" "0gi78bald70bc540jqcpa70x23hycywibn4raf5602hv4d5n8mnx";
buildInputs = [cmake qt];
}

View File

@ -2,13 +2,7 @@ args: with args;
stdenv.mkDerivation {
name = "soprano-1.9.0svn";
src = fetchsvn {
url = svn://anonsvn.kde.org/home/kde/trunk/kdesupport/soprano;
rev = 732646;
md5 = "c3b43544536f0f8061e4afeb9e368072";
};
src = svnSrc "soprano" "02xfp7g41ahxwczkxipyi13rav6akhwgspxdhgk5gm94rg10hq2l";
CLUCENE_HOME=cluceneCore;
buildInputs = [ cmake qt cluceneCore redland ];
}

View File

@ -2,13 +2,7 @@ args: with args;
stdenv.mkDerivation {
name = "strigi-svn";
src = fetchsvn {
url = svn://anonsvn.kde.org/home/kde/trunk/kdesupport/strigi;
rev = 732646;
md5 = "15762f5a406ef84bc1cdd776b2ca9a82";
};
src = svnSrc "strigi" "0dp145n93bqp91lvk2n10mghppyhdm3anh1l3a18d20hrvsm42z5";
CLUCENE_HOME=cluceneCore;
buildInputs = [ cmake zlib cluceneCore bzip2 libxml2 qt dbus
log4cxx stdenv.gcc.libc exiv2 bison cppunit perl ];

View File

@ -2,12 +2,6 @@ args: with args;
stdenv.mkDerivation {
name = "taglib-1.4svn";
src = fetchsvn {
url = svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib;
rev = 732646;
md5 = "647d68a76858cf3a667656c486b0a8c2";
};
src = svnSrc "taglib" "1myfgykflbs3l1mrzg4iv8rb1mbd0vpmzl5dnnslfi9b0xg6ydip";
buildInputs = [ cmake zlib ];
}

View File

@ -15,18 +15,18 @@ stdenv.mkDerivation ({
builder = if langF77 then ./fortran.sh else ./builder.sh;
src =
[(fetchurl {
optional /*langC*/ true (fetchurl {
url = mirror://gnu/gcc/gcc-4.1.2/gcc-core-4.1.2.tar.bz2;
sha256 = "07binc1hqlr0g387zrg5sp57i12yzd5ja2lgjb83bbh0h3gwbsbv";
})] ++
(if /*langCC*/ true then [(fetchurl {
}) ++
optional /*langCC*/ true (fetchurl {
url = mirror://gnu/gcc/gcc-4.1.2/gcc-g++-4.1.2.tar.bz2;
sha256 = "1qm2izcxna10jai0v4s41myki0xkw9174qpl6k1rnrqhbx0sl1hc";
})] else []) ++
(if langF77 then [(fetchurl {
}) ++
optional langF77 (fetchurl {
url = mirror://gnu/gcc/gcc-4.1.2/gcc-fortran-4.1.2.tar.bz2;
sha256 = "0772dhmm4gc10420h0d0mfkk2sirvjmjxz8j0ywm8wp5qf8vdi9z";
})] else []);
});
patches =
optional noSysDirs [./no-sys-dirs.patch];

View File

@ -40,6 +40,7 @@ if test "$noSysDirs" = "1"; then
done
makeFlagsArray=( \
"${makeFlagsArray[@]}" \
NATIVE_SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \
SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \
LIMITS_H_TEST=true \
@ -68,18 +69,30 @@ postInstall() {
# Remove `fixincl' to prevent a retained dependency on the
# previous gcc.
rm -rf $out/libexec/gcc/*/*/install-tools
rm -rf $out/lib/gcc/*/*/install-tools
# Get rid of some "fixed" header files
rm -rf $out/lib/gcc/*/*/include/root
# Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks.
for i in $out/bin/*-gcc*; do
if cmp -s $out/bin/gcc $i; then
ln -sfn gcc $i
fi
done
for i in $out/bin/*-c++* $out/bin/*-g++*; do
if cmp -s $out/bin/g++ $i; then
ln -sfn g++ $i
fi
done
}
if test -z "$staticCompiler"; then
if test -z "$profiledCompiler"; then
if test -z "$profiledCompiler"; then
buildFlags="bootstrap $buildFlags"
else
else
buildFlags="profiledbootstrap $buildFlags"
fi
fi
genericBuild

View File

@ -8,22 +8,24 @@ assert langC;
with import ../../../lib;
let version = "4.2.3"; in
stdenv.mkDerivation {
name = "gcc-4.2.0";
name = "gcc-${version}";
builder = ./builder.sh;
src =
optional /*langC*/ true (fetchurl {
url = mirror://gnu/gcc/gcc-4.2.0/gcc-core-4.2.0.tar.bz2;
sha256 = "0ykhzxhr8857dr97z0j9wyybfz1kjr71xk457cfapfw5fjas4ny1";
url = "mirror://gnu/gcc/gcc-${version}/gcc-core-${version}.tar.bz2";
sha256 = "04y84s46wzy4h44hpacf7vyla7b5zfc1qvdq3myvrhp82cp0bv4r";
}) ++
optional /*langCC*/ true (fetchurl {
url = mirror://gnu/gcc/gcc-4.2.0/gcc-g++-4.2.0.tar.bz2;
sha256 = "0k5ribrfdp9vmljxrglcgx2j2r7xnycd1rvd8sny2y5cj0l8ps12";
optional langCC (fetchurl {
url = "mirror://gnu/gcc/gcc-${version}/gcc-g++-${version}.tar.bz2";
sha256 = "0spzz549fifwv02ym33azzwizl0zkq5m1fgy88ccmcyzmwpgyzfq";
}) ++
optional langF77 (fetchurl {
url = mirror://gnu/gcc/gcc-4.2.0/gcc-fortran-4.2.0.tar.bz2;
sha256 = "0vw07qv6qpa5cgxc0qxraq6li2ibh8zrp65jrg92v4j63ivvi3hh";
url = "mirror://gnu/gcc/gcc-${version}/gcc-fortran-${version}.tar.bz2";
sha256 = "1l3ww6qymrkcfqlssb41a5fdnh6w2hqk0v2ijx56jgjbdnzawyp0";
});
patches =
@ -47,7 +49,7 @@ stdenv.mkDerivation {
${if stdenv.isi686 then "--with-arch=i686" else ""}
";
makeFlags = if staticCompiler then "LDFLAGS=-static" else "";
NIX_EXTRA_LDFLAGS = if staticCompiler then "-static" else "";
passthru = { inherit langC langCC langF77; };

View File

@ -120,26 +120,6 @@ diff -rc gcc-4.2.0-orig/gcc/gcc.c gcc-4.2.0/gcc/gcc.c
static const char *md_exec_prefix = MD_EXEC_PREFIX;
static const char *md_startfile_prefix = MD_STARTFILE_PREFIX;
diff -rc gcc-4.2.0-orig/ltcf-cxx.sh gcc-4.2.0/ltcf-cxx.sh
*** gcc-4.2.0-orig/ltcf-cxx.sh 2005-07-16 04:30:53.000000000 +0200
--- gcc-4.2.0/ltcf-cxx.sh 2007-05-20 17:16:44.000000000 +0200
***************
*** 989,995 ****
# the conftest object file.
pre_test_object_deps_done=no
! for p in `eval $output_verbose_link_cmd`; do
case $p in
--- 989,995 ----
# the conftest object file.
pre_test_object_deps_done=no
! for p in `true`; do
case $p in
diff -rc gcc-4.2.0-orig/ltconfig gcc-4.2.0/ltconfig
*** gcc-4.2.0-orig/ltconfig 2007-02-14 18:08:35.000000000 +0100
--- gcc-4.2.0/ltconfig 2007-05-20 22:16:24.000000000 +0200

View File

@ -1,7 +1,7 @@
args:
args.stdenv.lib.listOfListsToAttrs [
[ "3.08.0" (import ./3.08.0.nix (args // {stdenv = args.stdenv34;})) ]
[ "3.08.0" (import ./3.08.0.nix args) ]
[ "3.09.1" (import ./3.09.1.nix args) ]
[ "3.10.0" (import ./3.10.0.nix (args // {stdenv = args.stdenvUsingSetupNew2;})) ]
[ "3.10.0" (import ./3.10.0.nix args) ]
[ "default" (import ./3.09.1.nix args) ]
]

View File

@ -0,0 +1,12 @@
args: with args;
stdenv.mkDerivation {
name = "erlang-" + version;
src = fetchurl {
url = http://www.erlang.org/download/otp_src_R11B-5.tar.gz;
md5 = "96acec41da87d6ee0ef18e1aab36ffdd";
};
buildInputs = [perl gnum4 ncurses openssl];
patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';
configureFlags = "--with-ssl=${openssl}";
}

View File

@ -0,0 +1,12 @@
args: with args;
stdenv.mkDerivation {
name = "erlang-" + version;
src = fetchurl {
url = "http://www.erlang.org/download/otp_src_" + version + ".tar.gz";
sha256 = "16w7snhbjzwiywppsp04yiy2bkncff8pf4i643kqzkqx578jhaqz";
};
buildInputs = [perl gnum4 ncurses openssl];
patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';
configureFlags = "--with-ssl=${openssl}";
}

View File

@ -1,14 +0,0 @@
buildInputs="$perl $gnum4 $ncurses $openssl"
source $stdenv/setup
tar xfvz $src
cd otp_src_*
# Fix some hard coded paths to /bin/rm
sed -i -e "s|/bin/rm|rm|" lib/odbc/configure
sed -i -e "s|/bin/rm|rm|" erts/configure
./configure --prefix=$out --with-ssl=$openssl
make
make install

View File

@ -1,11 +0,0 @@
{stdenv, fetchurl, perl, ncurses, gnum4, openssl}:
stdenv.mkDerivation {
name = "erlang-R11B-5";
builder = ./builder.sh;
src = fetchurl {
url = http://www.erlang.org/download/otp_src_R11B-5.tar.gz;
md5 = "96acec41da87d6ee0ef18e1aab36ffdd";
};
inherit perl ncurses gnum4 openssl;
}

View File

@ -9,13 +9,19 @@ stdenv.mkDerivation {
sha256 = "1j8vzc6lva49mwdxkzhvm78dkxyprqs4n4057amqvsh4kh6i92l1";
};
patches = [
# This patch does the following:
# 1) Do use the PATH environment variable to find the `pwd' command.
# By default, Perl will only look for it in /lib and /usr/lib.
# !!! what are the security implications of this?
# 2) Force the use of <errno.h>, not /usr/include/errno.h, on Linux
# systems. (This actually appears to be due to a bug in Perl.)
patches = [./no-sys-dirs.patch];
./no-sys-dirs.patch
# Patch to make Perl 5.8.8 build with GCC 4.2. Taken from
# http://www.nntp.perl.org/group/perl.perl5.porters/2006/11/msg117738.html
./gcc-4.2.patch
];
setupHook = ./setup-hook.sh;
}

View File

@ -0,0 +1,10 @@
--- perl-5.8.x/makedepend.SH 2006-06-13 15:31:22.000000000 -0400
+++ perl-5.8.x-andy/makedepend.SH 2006-07-25 14:45:11.000000000 -0400
@@ -167,6 +167,7 @@
-e '/^#.*<builtin>/d' \
-e '/^#.*<built-in>/d' \
-e '/^#.*<command line>/d' \
+ -e '/^#.*<command-line>/d' \
-e '/^#.*"-"/d' \
-e '/: file path prefix .* never used$/d' \
-e 's#\.[0-9][0-9]*\.c#'"$file.c#" \

View File

@ -1,7 +1,5 @@
addPerlLibPath () {
if test -d $1/lib/site_perl; then
export PERL5LIB="${PERL5LIB}${PERL5LIB:+:}$1/lib/site_perl"
fi
addToSearchPath PERL5LIB /lib/site_perl "" $1
}
envHooks=(${envHooks[@]} addPerlLibPath)

View File

@ -30,7 +30,7 @@ stdenv.mkDerivation {
C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
configureFlags = "--enable-shared";
configureFlags = "--enable-shared --with-wctype-functions";
preConfigure = "
# Purity.

View File

@ -1,8 +1,5 @@
addPythonPath() {
local p=$1/lib/python2.5/site-packages
if test -d $p; then
export PYTHONPATH="${PYTHONPATH}${PYTHONPATH:+:}$p"
fi
addToSearchPathWithCustomDelimiter : PYTHONPATH /lib/python2.5/site-packages "" $1
}
toPythonPath() {

View File

@ -1,8 +1,5 @@
addPythonPath() {
local p=$1/lib/python2.4/site-packages
if test -d $p; then
export PYTHONPATH="${PYTHONPATH}${PYTHONPATH:+:}$p"
fi
addToSearchPathWithCustomDelimiter : PYTHONPATH /lib/python2.4/site-packages "" $1
}
toPythonPath() {

View File

@ -1,9 +1,15 @@
{stdenv, fetchurl}:
args: with args;
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "a52dec-0.7.4";
src = fetchurl {
url = http://liba52.sourceforge.net/files/a52dec-0.7.4.tar.gz;
md5 = "caa9f5bc44232dc8aeea773fea56be80";
url = "${meta.homepage}/files/a52dec-0.7.4.tar.gz";
sha256 = "0czccp4fcpf2ykp16xcrzdfmnircz1ynhls334q374xknd5747d2";
};
configureFlags = "--enable-shared --disable-static";
meta = {
homepage = http://liba52.sourceforge.net;
};
}

View File

@ -6,6 +6,7 @@ stdenv.mkDerivation {
url = http://losser.st-lab.cs.uu.nl/~eelco/dist/aterm-2.4.2-fixes-r2.tar.bz2;
sha256 = "1w3bxdpc2hz29li5ssmdcz3x0fn47r7g62ns0v8nazxwf40vff4j";
};
doCheck = true;
meta = {
homepage = http://www.cwi.nl/htbin/sen1/twiki/bin/view/SEN1/ATerm;
license = "LGPL";

View File

@ -0,0 +1,2 @@
args:
import ./common.nix "0q954lwhr6xnv7chhi4bqlmkn4nx9shyw0mbdr3n26018dgw65yq" args

View File

@ -0,0 +1,2 @@
args:
import ./common.nix "0lnxzsdhihb3kjwd3vcrl9pq6ykfbp0vy9ja0mch01ffnrqgiilx" args

View File

@ -0,0 +1,18 @@
sha256: args: with args;
stdenv.mkDerivation rec {
name = "avahi-" + version;
src = fetchurl {
url = "${meta.homepage}/download/${name}.tar.gz";
inherit sha256;
};
buildInputs = [pkgconfig libdaemon dbus perl perlXMLParser glib qt4];
configureFlags = "--disable-qt3 --disable-gdbm --disable-gtk --disable-mono
--with-distro=none --enable-shared --disable-static --disable-python";
meta = {
homepage = http://avahi.org;
};
}

View File

@ -1,14 +0,0 @@
{stdenv, fetchurl, pkgconfig, libdaemon, dbus}:
stdenv.mkDerivation {
name = "avahi-0.6.21";
src = fetchurl {
url = http://avahi.org/download/avahi-0.6.21.tar.gz;
sha256 = "d817c35f43011861476eab02eea14edd123b2bc58b4408d9d9b69b0c39252561";
};
#buildInputs = [pkgconfig glib gtk libpng libglade];
buildInputs = [pkgconfig libdaemon dbus];
configureFlags = "--disable-glib --disable-qt3 --disable-qt4 --disable-gtk --disable-expat --disable-gdbm --disable-python --disable-mono --with-distro=none CPPFLAGS=-Ddbus_watch_get_unix_fd=dbus_watch_get_fd";
}

View File

@ -10,5 +10,6 @@ stdenv.mkDerivation {
preConfigure="
sed -e 's@^BJAM_CONFIG=\"\"@BJAM_CONFIG=\"--layout=system release threading=multi link=shared\"@g' -i configure
";
patches = [./gcc-4.2.patch];
configureFlags="--with-icu=${icu}";
}

View File

@ -0,0 +1,11 @@
Index: trunk/tools/jam/src/build.jam
===================================================================
--- trunk/tools/jam/src/build.jam (revision 40095)
+++ trunk/tools/jam/src/build.jam (revision 41036)
@@ -176,5 +176,5 @@
## GCC 2.x, 3.x, 4.x
toolset gcc gcc : "-o " : -D
- : -pedantic
+ : -pedantic -fno-strict-aliasing
[ opt --release : [ opt --symbols : -g : -s ] -O3 ]
[ opt --debug : -g -O0 -fno-inline ]

View File

@ -0,0 +1,15 @@
args: with args;
stdenv.mkDerivation rec {
name = "cairomm-1.4.6";
src = fetchurl {
url = "http://cairographics.org/releases/${name}.tar.gz";
sha256 = "1zd5pq5jd507w1v994awpsl7m26g4dfl0rwgrxig2823hl3rqmrp";
};
buildInputs = [pkgconfig];
propagatedBuildInputs = [cairo x11 fontconfig freetype];
configureFlags = "--enable-shared --disable-static";
}

View File

@ -6,9 +6,10 @@ stdenv.mkDerivation rec {
url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz";
sha256 = "1qmbnd9xgg7vahlfywd8sfd9yqhx8jdyczz3cshfsd4qc76xhw78";
};
inherit dbus glib;
buildInputs = [pkgconfig gettext glib expat];
propagatedBuildInputs = [dbus];
buildInputs = [pkgconfig expat gettext];
propagatedBuildInputs = [dbus.libs glib];
configureFlags = "--enable-shared --disable-static";
passthru = { inherit dbus glib; };
meta = {
homepage = http://dbus.freedesktop.org;

View File

@ -1,22 +1,42 @@
{stdenv, fetchurl, pkgconfig, expat}:
stdenv.mkDerivation {
name = "dbus-1.0.2";
args: with args;
let
version = "1.0.2";
src = fetchurl {
url = http://dbus.freedesktop.org/releases/dbus/dbus-1.0.2.tar.gz;
url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";
sha256 = "1jn652zb81mczsx4rdcwrrzj3lfhx9d107zjfnasc4l5yljl204a";
};
configureFlags = "--disable-static --localstatedir=/var --with-session-socket-dir=/tmp";
in rec {
libs = stdenv.mkDerivation {
name = "dbus-library-" + version;
buildInputs = [pkgconfig expat];
configureFlags = "--without-x --localstatedir=/var";
inherit src configureFlags;
patchPhase = ''
sed -i /mkinstalldirs.*localstatedir/d bus/Makefile.in
sed -i '/SUBDIRS/s/ tools//' Makefile.in
'';
};
# Awful hack: `make install' wants to write in /var, but it
# can't. So redirect it with a DESTDIR.
preInstall = "
installFlagsArray=(DESTDIR=$out/destdir)
";
tools = stdenv.mkDerivation {
name = "dbus-tools-" + version;
inherit src configureFlags;
buildInputs = [pkgconfig expat libs]
++ (if useX11 then [libX11 libICE libSM] else []);
postConfigure = "cd tools";
postInstall = "
mv $out/destdir/$out/* $out
rm -rf $out/destdir
";
NIX_LDFLAGS = "-ldbus-1";
makeFlags = "DBUS_DAEMONDIR=${daemon}/bin";
patchPhase = ''
sed -i 's@ $(top_builddir)/dbus/libdbus-1.la@@' tools/Makefile.in
sed -i '/mkdir.*localstate/d' tools/Makefile.in
'';
};
# I'm too lazy to separate daemon and libs now.
daemon = libs;
# FIXME TODO
# After merger it will be better to correct upstart-job instead.
outPath = daemon.outPath;
}

View File

@ -1,13 +0,0 @@
args: with args;
stdenv.mkDerivation {
name = "dbus-1.0.2";
src = fetchurl {
url = http://dbus.freedesktop.org/releases/dbus/dbus-1.0.2.tar.gz;
sha256 = "1jn652zb81mczsx4rdcwrrzj3lfhx9d107zjfnasc4l5yljl204a";
};
buildInputs = [pkgconfig expat libX11 libICE libSM];
configureFlags = "--with-x --disable-static --localstatedir=/var --with-session-socket-dir=/tmp";
patchPhase = "sed -e /mkinstalldirs.*localstatedir/d -i bus/Makefile.in";
}

View File

@ -0,0 +1,14 @@
args: with args;
stdenv.mkDerivation rec {
name = "enchant-" + version;
src = fetchurl {
url = "http://www.abisource.com/downloads/enchant/${version}/${name}.tar.gz";
sha256 = "1vwqwsadnp4rf8wj7d4rglvszjzlcli0jyxh06h8inka1sm1al76";
};
buildInputs = [aspell pkgconfig glib];
configureFlags = "--enable-shared --disable-static";
meta = {
homepage = http://www.abisource.com/enchant;
};
}

View File

@ -1,10 +0,0 @@
args: with args;
stdenv.mkDerivation {
name = "enchant-1.3.0";
src = fetchurl {
url = http://FIXME/enchant-1.3.0.tar.gz;
sha256 = "1vwqwsadnp4rf8wj7d4rglvszjzlcli0jyxh06h8inka1sm1al76";
};
buildInputs = [aspell pkgconfig glib];
configureFlags = "--enable-shared --disable-static";
}

View File

@ -9,4 +9,5 @@ stdenv.mkDerivation {
};
buildInputs = [x11 mesa];
patches = ./freeglut-gcc-4.2.patch;
}

View File

@ -0,0 +1,13 @@
diff -urN freeglut-2.4.0.old/src/freeglut_joystick.c freeglut-2.4.0/src/freeglut_joystick.c
--- freeglut-2.4.0.old/src/freeglut_joystick.c 2007-06-16 03:51:41.000000000 +0000
+++ freeglut-2.4.0/src/freeglut_joystick.c 2007-06-16 03:54:27.000000000 +0000
@@ -1682,9 +1682,6 @@
fgInitialiseJoysticks ();
- if ( !fgJoystick )
- return 0;
-
if ( !fgState.JoysticksInitialised )
return 0;

View File

@ -1,8 +0,0 @@
args:
args.stdenv.lib.listOfListsToAttrs [
[ "recurseForDerivations" true ]
[ "0.14.6" (import ./0.14.6.nix args) ]
[ "0.15" (import ./0.15.nix args) ]
[ "0.16.x" (import ./0.16.x.nix args) ]
[ "default" (import ./0.14.6.nix args) ]
]

View File

@ -12,10 +12,18 @@ preConfigure=preConfigure
preConfigure() {
for i in configure io/ftwtest-sh; do
substituteInPlace "$i" \
--replace "@PWD@" "pwd"
# Can't use substituteInPlace here because replace hasn't been
# built yet in the bootstrap.
sed -i "$i" -e "s^/bin/pwd^$PWD_P^g"
done
# In the glibc 2.6/2.7 tarballs C-translit.h is a little bit older
# than C-translit.h.in, forcing Make to rebuild it unnecessarily.
# This wouldn't be problem except that it requires Perl, which we
# don't want as a dependency in the Nixpkgs bootstrap. So force
# the output file to be newer.
touch locale/C-translit.h
mkdir ../build
cd ../build

View File

@ -1,31 +1,32 @@
{ stdenv, fetchurl, kernelHeaders
,perl
, installLocales ? true
, profilingLibraries ? false
}:
stdenv.mkDerivation {
name = "glibc-2.6.1-nptl";
name = "glibc-2.7";
builder = ./builder.sh;
src =
fetchurl {
url = http://ftp.gnu.org/gnu/glibc/glibc-2.6.1.tar.bz2;
sha256 = "08pcfsi9zpikjakljklks2ln3hn7544cr9br4kbh5kx27cy3mv9x";
src = fetchurl {
url = mirror://gnu/glibc/glibc-2.7.tar.bz2;
sha256 = "06j5q20l11x8kcrl9bg15xgb1pw0w82pazikxf4zvq2fmhiaa922";
};
patches = [ ./glibc-pwd.patch ./glibc-getcwd-param-MAX.patch ];
inherit kernelHeaders installLocales;
inherit (stdenv) is64bit;
buildInputs=[perl];
# `--with-tls --without-__thread' enables support for TLS but causes
# it not to be used. Required if we don't want to barf on 2.4
# kernels. Or something.
configureFlags="--enable-add-ons
--with-headers=${kernelHeaders}/include
${if profilingLibraries then "--enable-profile" else "--disable-profile"}";
# Workaround for this bug:
# http://sourceware.org/bugzilla/show_bug.cgi?id=411
# I.e. when gcc is compiled with --with-arch=i686, then the
# preprocessor symbol `__i686' will be defined to `1'. This causes
# the symbol __i686.get_pc_thunk.dx to be mangled.
NIX_CFLAGS_COMPILE = "-U__i686";
}

View File

@ -1,26 +0,0 @@
{ xineramaSupport ? false
, stdenv, fetchurl, pkgconfig, gettext, perl, x11
, libtiff, libjpeg, libpng, cairo, libXinerama ? null, libXrandr
}:
rec {
glib = (import ./glib) {
inherit fetchurl stdenv pkgconfig gettext perl;
};
atk = (import ./atk) {
inherit fetchurl stdenv pkgconfig glib perl;
};
pango = (import ./pango) {
inherit fetchurl stdenv pkgconfig glib x11 cairo libpng;
};
gtk = (import ./gtk+) {
inherit fetchurl stdenv pkgconfig glib atk pango perl
libtiff libjpeg libpng x11 cairo libXinerama
xineramaSupport libXrandr;
};
}

View File

@ -1,22 +0,0 @@
{ xineramaSupport ? false
, stdenv, fetchurl, pkgconfig, x11, glib, atk
, pango, perl, libtiff, libjpeg, libpng, cairo, libXinerama ? null, libXrandr
}:
assert x11.buildClientLibs;
assert xineramaSupport -> libXinerama != null;
stdenv.mkDerivation {
name = "gtk+-2.10.14";
src = fetchurl {
url = ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-2.10.14.tar.bz2;
sha256 = "1qjdx9kdc533dajdy1kv3ssxzh7gz7j7vzgw0ax910q4klil88yh";
};
buildInputs = [
pkgconfig perl libtiff libjpeg libpng cairo libXrandr
(if xineramaSupport then libXinerama else null)
];
propagatedBuildInputs = [x11 glib atk pango];
inherit libtiff libjpeg libpng;
}

View File

@ -1,13 +0,0 @@
{stdenv, fetchurl, pkgconfig, glib, perl}:
assert pkgconfig != null && glib != null && perl != null;
stdenv.mkDerivation {
name = "atk-1.2.4";
src = fetchurl {
url = ftp://ftp.gtk.org/pub/gtk/v2.2/atk-1.2.4.tar.bz2;
md5 = "2d6d50df31abe0e8892b5d3e7676a02d";
};
buildInputs = [pkgconfig perl];
propagatedBuildInputs = [glib];
}

View File

@ -1,12 +0,0 @@
{stdenv, fetchurl, pkgconfig, gettext, perl}:
assert pkgconfig != null && gettext != null && perl != null;
stdenv.mkDerivation {
name = "glib-2.2.3";
src = fetchurl {
url = ftp://ftp.gtk.org/pub/gtk/v2.2/glib-2.2.3.tar.bz2;
md5 = "aa214a10d873b68ddd67cd9de2ccae55";
};
buildInputs = [pkgconfig gettext perl];
}

View File

@ -1,21 +0,0 @@
{ stdenv, fetchurl, pkgconfig, x11, glib, atk
, pango, perl, libtiff, libjpeg, libpng}:
assert pkgconfig != null && x11 != null && glib != null && atk != null
&& pango != null && perl != null && perl != null && libtiff != null
&& libjpeg != null && libpng != null;
assert x11.buildClientLibs;
#assert glib == atk.glib;
#assert glib == pango.glib;
#assert x11 == pango.x11;
stdenv.mkDerivation {
name = "gtk+-2.2.4";
src = fetchurl {
url = ftp://ftp.gtk.org/pub/gtk/v2.2/gtk+-2.2.4.tar.bz2;
md5 = "605332199533e73bc6eec481fb4f1671";
};
buildInputs = [pkgconfig perl libtiff libjpeg libpng];
propagatedBuildInputs = [x11 glib atk pango];
inherit libtiff libjpeg libpng;
}

View File

@ -1,14 +0,0 @@
{stdenv, fetchurl, pkgconfig, x11, glib}:
assert pkgconfig != null && x11 != null && glib != null;
assert x11.buildClientLibs;
stdenv.mkDerivation {
name = "pango-1.2.5";
src = fetchurl {
url = ftp://ftp.gtk.org/pub/gtk/v2.2/pango-1.2.5.tar.bz2;
md5 = "df00fe3e71cd297010f24f439b6c8ee6";
};
buildInputs = [pkgconfig];
propagatedBuildInputs = [x11 glib];
}

View File

@ -1,13 +0,0 @@
{stdenv, fetchurl, pkgconfig, glib, perl}:
assert pkgconfig != null && glib != null && perl != null;
stdenv.mkDerivation {
name = "atk-1.6.1";
src = fetchurl {
url = ftp://ftp.gtk.org/pub/gtk/v2.4/atk-1.6.1.tar.bz2;
md5 = "f77be7e128c957bd3056c2e270b5f283";
};
buildInputs = [pkgconfig perl];
propagatedBuildInputs = [glib];
}

View File

@ -1,23 +0,0 @@
{ stdenv, fetchurl, pkgconfig, gettext, perl, x11
, libtiff, libjpeg, libpng}:
rec {
glib = (import ./glib) {
inherit fetchurl stdenv pkgconfig gettext perl;
};
atk = (import ./atk) {
inherit fetchurl stdenv pkgconfig glib perl;
};
pango = (import ./pango) {
inherit fetchurl stdenv pkgconfig glib x11;
};
gtk = (import ./gtk+) {
inherit fetchurl stdenv pkgconfig glib atk pango perl
libtiff libjpeg libpng x11;
};
}

View File

@ -1,12 +0,0 @@
{stdenv, fetchurl, pkgconfig, gettext, perl}:
assert pkgconfig != null && gettext != null && perl != null;
stdenv.mkDerivation {
name = "glib-2.4.7";
src = fetchurl {
url = ftp://ftp.gtk.org/pub/gtk/v2.4/glib-2.4.7.tar.bz2;
md5 = "eff6fec89455addf8b0dee5a19e343be";
};
buildInputs = [pkgconfig gettext perl];
}

View File

@ -1,21 +0,0 @@
{ stdenv, fetchurl, pkgconfig, x11, glib, atk
, pango, perl, libtiff, libjpeg, libpng}:
assert pkgconfig != null && x11 != null && glib != null && atk != null
&& pango != null && perl != null && perl != null && libtiff != null
&& libjpeg != null && libpng != null;
assert x11.buildClientLibs;
#assert glib == atk.glib;
#assert glib == pango.glib;
#assert x11 == pango.x11;
stdenv.mkDerivation {
name = "gtk+-2.4.13";
src = fetchurl {
url = ftp://ftp.gtk.org/pub/gtk/v2.4/gtk+-2.4.13.tar.bz2;
md5 = "3a438e1010704b11acaf060c9ba0fd7b";
};
buildInputs = [pkgconfig perl libtiff libjpeg libpng];
propagatedBuildInputs = [x11 glib atk pango];
inherit libtiff libjpeg libpng;
}

View File

@ -1,14 +0,0 @@
{stdenv, fetchurl, pkgconfig, x11, glib}:
assert pkgconfig != null && x11 != null && glib != null;
assert x11.buildClientLibs;
stdenv.mkDerivation {
name = "pango-1.4.1";
src = fetchurl {
url = ftp://ftp.gtk.org/pub/gtk/v2.4/pango-1.4.1.tar.bz2;
md5 = "39868e0da250fd4c00b2970e4eb84389";
};
buildInputs = [pkgconfig];
propagatedBuildInputs = [x11 glib];
}

View File

@ -1,23 +0,0 @@
{ stdenv, fetchurl, pkgconfig, gettext, perl, x11
, libtiff, libjpeg, libpng}:
rec {
glib = (import ./glib) {
inherit fetchurl stdenv pkgconfig gettext perl;
};
atk = (import ./atk) {
inherit fetchurl stdenv pkgconfig glib perl;
};
pango = (import ./pango) {
inherit fetchurl stdenv pkgconfig glib x11;
};
gtk = (import ./gtk+) {
inherit fetchurl stdenv pkgconfig glib atk pango perl
libtiff libjpeg libpng x11;
};
}

View File

@ -1,6 +1,4 @@
{stdenv, fetchurl, pkgconfig, glib, perl}:
assert pkgconfig != null && glib != null && perl != null;
args: with args;
stdenv.mkDerivation {
name = "atk-1.12.4";

View File

@ -0,0 +1,16 @@
args: with args;
rec {
glib = (import ./glib) args;
atk = (import ./atk) (args // { inherit glib; });
pango = (import ./pango) (args // { inherit glib; });
gtk = (import ./gtk+) (args // { inherit glib atk pango; } );
glibmm = (import ./glibmm) (args // { inherit glib; });
gtkmm = (import ./gtkmm) (args // { inherit gtk atk glibmm; });
}

View File

@ -1,6 +1,4 @@
{stdenv, fetchurl, pkgconfig, gettext, perl}:
assert pkgconfig != null && gettext != null && perl != null;
args: with args;
stdenv.mkDerivation {
name = "glib-2.12.13"; # <- sic! gtk 2.10 needs glib 2.12

View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, glib, libsigcxx}:
args: with args;
stdenv.mkDerivation {
name = "glibmm-2.12.10";
@ -7,6 +7,7 @@ stdenv.mkDerivation {
sha256 = "02rjjdh0f6kafa1sn4y5ykvm4f2qn3yh4kr4lngcv7vzasqn1dr1";
};
buildInputs = [pkgconfig glib libsigcxx];
buildInputs = [pkgconfig];
propagatedBuildInputs = [glib libsigcxx];
}

View File

@ -0,0 +1,13 @@
args: with args;
stdenv.mkDerivation {
name = "gtk+-2.10.14";
src = fetchurl {
url = ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-2.10.14.tar.bz2;
sha256 = "1qjdx9kdc533dajdy1kv3ssxzh7gz7j7vzgw0ax910q4klil88yh";
};
buildInputs = [ pkgconfig perl ];
propagatedBuildInputs = [x11 glib atk pango libtiff libjpeg libpng cairo
libXrandr (if xineramaSupport then libXinerama else null)];
passthru = { inherit libtiff libjpeg libpng; };
}

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtk, atk, glibmm, libsigcxx}:
args: with args;
stdenv.mkDerivation {
name = "gtkmm-2.10.11";
@ -7,6 +7,7 @@ stdenv.mkDerivation {
sha256 = "1bri9r0k69dmi5xgzrlfllp3adfzhz8dh9zkcvi6sjkgfwi594vx";
};
buildInputs = [pkgconfig gtk atk glibmm libsigcxx];
buildInputs = [pkgconfig];
propagatedBuildInputs = [glibmm gtk atk cairomm];
}

View File

@ -1,6 +1,4 @@
{stdenv, fetchurl, pkgconfig, x11, glib, cairo, libpng}:
assert x11.buildClientLibs;
args: with args;
stdenv.mkDerivation {
name = "pango-1.14.10";
@ -8,6 +6,6 @@ stdenv.mkDerivation {
url = ftp://ftp.gtk.org/pub/pango/1.14/pango-1.14.10.tar.bz2;
md5 = "e9fc2f8168e74e2fa0aa8238ee0e9c06";
};
buildInputs = [pkgconfig libpng];
propagatedBuildInputs = [x11 glib cairo];
buildInputs = [pkgconfig];
propagatedBuildInputs = [x11 glib cairo libpng];
}

Some files were not shown because too many files have changed in this diff Show More