Skip to content

Commit

Permalink
libav: remove /bin/sh dependencies
Browse files Browse the repository at this point in the history
that resulted in some Hydra build fails

(cherry picked from commit adbd25c)
  • Loading branch information
xeji authored and shlevy committed Mar 9, 2018
1 parent eadbc34 commit 8e58deb
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions pkgs/development/libraries/libav/default.nix
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, yasm, bzip2, zlib, perl
{ stdenv, fetchurl, pkgconfig, yasm, bzip2, zlib, perl, bash
, mp3Support ? true, lame ? null
, speexSupport ? true, speex ? null
, theoraSupport ? true, libtheora ? null
Expand Down Expand Up @@ -45,7 +45,11 @@ let
++ optional (vpxSupport && hasPrefix "0.8." version) ./vpxenc-0.8.17-libvpx-1.5.patch
;

preConfigure = "patchShebangs doc/texi2pod.pl";
postPatch = ''
patchShebangs .
# another shebang was hidden in a here document text
substituteInPlace ./configure --replace "#! /bin/sh" "#!${bash}/bin/sh"
'';

configureFlags =
assert stdenv.lib.all (x: x!=null) buildInputs;
Expand All @@ -71,8 +75,8 @@ let
++ optional freetypeSupport "--enable-libfreetype"
;

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ lame yasm zlib bzip2 SDL ]
nativeBuildInputs = [ pkgconfig perl ];
buildInputs = [ lame yasm zlib bzip2 SDL bash ]
++ [ perl ] # for install-man target
++ optional mp3Support lame
++ optional speexSupport speex
Expand All @@ -95,6 +99,7 @@ let
# alltools to build smaller tools, incl. aviocat, ismindex, qt-faststart, etc.
buildFlags = "all alltools install-man";


postInstall = ''
moveToOutput bin "$bin"
# alltools target compiles an executable in tools/ for every C
Expand Down

0 comments on commit 8e58deb

Please sign in to comment.