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

fix mpich2 and mplayer

Browse Source
This commit is contained in:
Florian Friesdorf 2012-07-24 14:16:22 +02:00
parent 0b112cb489
commit 471a9615a2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/video/MPlayer/default.nix
View File

@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ freetype zlib pkgconfig ] [ 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 alsaSupport alsaLib
++ stdenv.lib.optional xvSupport libXv ++ stdenv.lib.optional xvSupport libXv
++ stdenv.lib.optional theoraSupport libtheora ++ stdenv.lib.optional theoraSupport libtheora

2
pkgs/development/libraries/mpich2/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation {
configureFlags = "--enable-shared --enable-sharedlib"; configureFlags = "--enable-shared --enable-sharedlib";
buildInputs = [ python perl gfortran ]; buildInputs = [ python perl gfortran ];
propagatedBuildInputs = stdenv.lib.optional (stdenv ? glibc) [ stdenv.glibc ]; propagatedBuildInputs = stdenv.lib.optional (stdenv ? glibc) stdenv.glibc;
patchPhase = patchPhase =
'' for i in $(find -type f -not -name Makefile.\*) '' for i in $(find -type f -not -name Makefile.\*)