Author: urkud
Date: Wed Oct 5 15:09:09 2011
New Revision: 29662
URL: http://nixos.org/websvn/nix/?rev=29662&sc=1
Log:
svn merge trunk
Modified:
nixpkgs/branches/libpng15/ (props changed)
nixpkgs/branches/libpng15/pkgs/applications/graphics/xscreensaver/default.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/applications/misc/xneur/0.8.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/applications/networking/browsers/icecat-4/
(props changed)
nixpkgs/branches/libpng15/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/
(props changed)
nixpkgs/branches/libpng15/pkgs/build-support/gcc-wrapper/ (props changed)
nixpkgs/branches/libpng15/pkgs/build-support/release/debian-build.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/build-support/release/nix-build.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/build-support/release/rpm-build.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/build-support/release/source-tarball.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/desktops/kde-4.5/support/shared-desktop-ontologies/
(props changed)
nixpkgs/branches/libpng15/pkgs/development/compilers/ghc/6.10.1.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/development/compilers/ghc/6.10.2.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/development/compilers/ghc/6.8.2.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/development/compilers/ghc/6.8.3.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/development/libraries/aterm/2.8.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/development/libraries/babl/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/fltk/fltk11.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/development/libraries/gegl/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/glibc-2.9/ (props
changed)
nixpkgs/branches/libpng15/pkgs/development/libraries/goocanvas/ (props
changed)
nixpkgs/branches/libpng15/pkgs/development/libraries/pcre/default.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/development/libraries/readline/readline6.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/development/tools/analysis/valgrind/default.nix
nixpkgs/branches/libpng15/pkgs/development/tools/misc/autoconf/2.13.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/development/tools/misc/gnum4/default.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/misc/tex/pgf/1.x.nix (props changed)
nixpkgs/branches/libpng15/pkgs/misc/tex/pgf/2.x.nix (props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/atheros/r3867.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel-headers/2.6.28.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel-headers/2.6.32.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/generic.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.25.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.27.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.28.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.29.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.33.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/qemu-kvm/default.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/util-linux-ng/ (props
changed)
nixpkgs/branches/libpng15/pkgs/servers/mail/dovecot/1.1.1.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/shells/bash/4.1.nix (props changed)
nixpkgs/branches/libpng15/pkgs/shells/bash/4.2.nix (props changed)
nixpkgs/branches/libpng15/pkgs/stdenv/generic/setup.sh (props changed)
nixpkgs/branches/libpng15/pkgs/stdenv/linux/make-bootstrap-tools.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/tools/networking/wget/default.nix (props
changed)
Modified: nixpkgs/branches/libpng15/pkgs/development/libraries/babl/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/development/libraries/babl/default.nix
Wed Oct 5 14:45:49 2011 (r29661)
+++ nixpkgs/branches/libpng15/pkgs/development/libraries/babl/default.nix
Wed Oct 5 15:09:09 2011 (r29662)
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
-stdenv.mkDerivation {
- name = "babl-0.0.22";
+stdenv.mkDerivation rec {
+ name = "babl-0.1.4";
src = fetchurl {
- url = ftp://ftp.gtk.org/pub/babl/0.0/babl-0.0.22.tar.bz2;
- sha256 = "0v8gbf9si4sd06199f8lfmrsbvi6i0hxphd34kyvsj6g2kkkg10s";
+ url = "ftp://ftp.gimp.org/pub/babl/0.1/${name}.tar.bz2";;
+ sha256 = "0cz7zw206bb87c0n0h54h4wlkaa3hx3wsia30mgq316y50jk2djv";
};
meta = {
Modified: nixpkgs/branches/libpng15/pkgs/development/libraries/gegl/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/development/libraries/gegl/default.nix
Wed Oct 5 14:45:49 2011 (r29661)
+++ nixpkgs/branches/libpng15/pkgs/development/libraries/gegl/default.nix
Wed Oct 5 15:09:09 2011 (r29662)
@@ -1,17 +1,20 @@
{ stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg
-, librsvg, pango, gtk }:
+, librsvg, pango, gtk, bzip2 }:
-stdenv.mkDerivation {
- name = "gegl-0.0.22";
+stdenv.mkDerivation rec {
+ name = "gegl-0.1.6";
src = fetchurl {
- url = ftp://ftp.gimp.org/pub/gegl/0.0/gegl-0.0.22.tar.bz2;
- sha256 = "0nx6r9amzhw5d2ghlw3z8qnry18rwz1ymvl2cm31b8p49z436wl5";
+ url = "ftp://ftp.gimp.org/pub/gegl/0.1/${name}.tar.bz2";;
+ sha256 = "1l966ygss2zkksyw62nm139v2abfzbqqrj0psizvbgzf4mb24rm1";
};
- configureFlags = "--disable-docs"; # needs fonts otherwise don't know how
to pass them
+ # needs fonts otherwise don't know how to pass them
+ configureFlags = "--disable-docs";
- buildInputs = [ pkgconfig glib babl libpng cairo libjpeg librsvg pango gtk ];
+ buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk bzip2 ];
+
+ buildNativeInputs = [ pkgconfig ];
meta = {
description = "Graph-based image processing framework";
Modified:
nixpkgs/branches/libpng15/pkgs/development/tools/analysis/valgrind/default.nix
==============================================================================
---
nixpkgs/branches/libpng15/pkgs/development/tools/analysis/valgrind/default.nix
Wed Oct 5 14:45:49 2011 (r29661)
+++
nixpkgs/branches/libpng15/pkgs/development/tools/analysis/valgrind/default.nix
Wed Oct 5 15:09:09 2011 (r29662)
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, perl, gdb, autoconf, automake }:
+{ stdenv, fetchurl, perl, gdb }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
name = "valgrind-3.6.1";
src = fetchurl {
@@ -10,11 +10,13 @@
# Perl is needed for `cg_annotate'.
# GDB is needed to provide a sane default for `--db-command'.
- buildNativeInputs = [ perl autoconf automake ];
+ buildNativeInputs = [ perl ];
buildInputs = stdenv.lib.optional (!stdenv.isDarwin) gdb;
configureFlags =
- if stdenv.system == "x86_64-linux" then ["--enable-only64bit"] else [];
+ if (stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin")
+ then [ "--enable-only64bit" ]
+ else [];
postInstall = ''
for i in $out/lib/valgrind/*.supp; do
@@ -39,8 +41,39 @@
license = "GPLv2+";
- maintainers = [ stdenv.lib.maintainers.eelco ];
-
+ maintainers = with stdenv.lib.maintainers; [ eelco ludo ];
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
};
}
+
+//
+
+(if stdenv.isDarwin
+ then {
+ patchPhase =
+ # Apple's GCC doesn't recognize `-arch' (as of version 4.2.1, build 5666).
+ '' echo "getting rid of the \`-arch' GCC option..."
+ find -name Makefile\* -exec \
+ sed -i {} -e's/DARWIN\(.*\)-arch [^ ]\+/DARWIN\1/g' \;
+
+ sed -i coregrind/link_tool_exe_darwin.in \
+ -e 's/^my \$archstr = .*/my $archstr = "x86_64";/g'
+ '';
+
+ preConfigure =
+ # Shamelessly drag in MIG.
+ '' mkdir -p "$TMPDIR/impure-deps/bin"
+
+ # MIG assumes the standard Darwin core utilities (e.g., `rm -d'), so
+ # let it see the impure directories.
+ cat > "$TMPDIR/impure-deps/bin/mig" <<EOF
+#!/bin/sh
+export PATH="/usr/bin:/bin:\$PATH"
+exec /usr/bin/mig "\$@"
+EOF
+ chmod +x "$TMPDIR/impure-deps/bin/mig"
+
+ export PATH="$TMPDIR/impure-deps/bin:$PATH"
+ '';
+ }
+ else {}))
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
