diff options
| -rw-r--r-- | pkgs/development/libraries/babl/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/libraries/gegl/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/development/tools/analysis/valgrind/default.nix | 45 |
3 files changed, 53 insertions, 17 deletions
diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 2464a09f51aa..77ddecd71c0f 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -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 = { diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index 3b1900ae89c5..8fa87d90be2e 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -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"; diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 6b35cbc4e68e..a9774a846389 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -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 @@ stdenv.mkDerivation rec { # 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 @@ stdenv.mkDerivation rec { 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 {})) |