mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 07:53:19 +00:00
Merge branch 'libav-shebangs' of git://github.com/xeji/nixpkgs
This commit is contained in:
commit
98d177252a
@ -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
|
||||
@ -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;
|
||||
@ -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
|
||||
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user