public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libav: remove /bin/sh dependencies

Browse Source 
that resulted in some Hydra build fails
This commit is contained in:
xeji 2018-03-08 23:34:57 +01:00
parent 3476508443
commit adbd25c75c
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/libav/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, yasm, bzip2, zlib, perl { stdenv, fetchurl, pkgconfig, yasm, bzip2, zlib, perl, bash
, mp3Support ? true, lame ? null , mp3Support ? true, lame ? null
, speexSupport ? true, speex ? null , speexSupport ? true, speex ? null
, theoraSupport ? true, libtheora ? null , theoraSupport ? true, libtheora ? null
@ -45,7 +45,11 @@ let
++ optional (vpxSupport && hasPrefix "0.8." version) ./vpxenc-0.8.17-libvpx-1.5.patch ++ 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 = configureFlags =
assert stdenv.lib.all (x: x!=null) buildInputs; assert stdenv.lib.all (x: x!=null) buildInputs;
@ -71,8 +75,8 @@ let
++ optional freetypeSupport "--enable-libfreetype" ++ optional freetypeSupport "--enable-libfreetype"
; ;
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig perl ];
buildInputs = [ lame yasm zlib bzip2 SDL ] buildInputs = [ lame yasm zlib bzip2 SDL bash ]
++ [ perl ] # for install-man target ++ [ perl ] # for install-man target
++ optional mp3Support lame ++ optional mp3Support lame
++ optional speexSupport speex ++ optional speexSupport speex
@ -95,6 +99,7 @@ let
# alltools to build smaller tools, incl. aviocat, ismindex, qt-faststart, etc. # alltools to build smaller tools, incl. aviocat, ismindex, qt-faststart, etc.
buildFlags = "all alltools install-man"; buildFlags = "all alltools install-man";
postInstall = '' postInstall = ''
moveToOutput bin "$bin" moveToOutput bin "$bin"
# alltools target compiles an executable in tools/ for every C # alltools target compiles an executable in tools/ for every C