From 471a9615a22a420738141c30055483a91e735b9f Mon Sep 17 00:00:00 2001 From: Florian Friesdorf <flo@chaoflow.net> Date: Tue, 24 Jul 2012 14:16:22 +0200 Subject: [PATCH] fix mpich2 and mplayer --- pkgs/applications/video/MPlayer/default.nix | 2 +- pkgs/development/libraries/mpich2/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix index 3c1cd2ff4472..566089201cda 100644 --- a/pkgs/applications/video/MPlayer/default.nix +++ b/pkgs/applications/video/MPlayer/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { buildInputs = [ freetype zlib pkgconfig ] - ++ stdenv.lib.optional x11Support [ libX11 libXext mesa ] + ++ stdenv.lib.optionals x11Support [ libX11 libXext mesa ] ++ stdenv.lib.optional alsaSupport alsaLib ++ stdenv.lib.optional xvSupport libXv ++ stdenv.lib.optional theoraSupport libtheora diff --git a/pkgs/development/libraries/mpich2/default.nix b/pkgs/development/libraries/mpich2/default.nix index 967abe500e26..0ad2d4e47490 100644 --- a/pkgs/development/libraries/mpich2/default.nix +++ b/pkgs/development/libraries/mpich2/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { configureFlags = "--enable-shared --enable-sharedlib"; buildInputs = [ python perl gfortran ]; - propagatedBuildInputs = stdenv.lib.optional (stdenv ? glibc) [ stdenv.glibc ]; + propagatedBuildInputs = stdenv.lib.optional (stdenv ? glibc) stdenv.glibc; patchPhase = '' for i in $(find -type f -not -name Makefile.\*)