diff options
| author | xeji <xeji@cat3.de> | 2018-03-08 23:34:57 +0100 |
|---|---|---|
| committer | xeji <xeji@cat3.de> | 2018-03-09 00:32:57 +0100 |
| commit | adbd25c75c6b2809bcd97486a22caf0cfeb74d4c (patch) | |
| tree | 4d839e0513b30d89c35f5bba5fed8b9354808edc /pkgs/development/libraries/libav | |
| parent | 3476508443d583a30a0bb1aa6539717820943a04 (diff) | |
| download | nixlib-adbd25c75c6b2809bcd97486a22caf0cfeb74d4c.tar nixlib-adbd25c75c6b2809bcd97486a22caf0cfeb74d4c.tar.gz nixlib-adbd25c75c6b2809bcd97486a22caf0cfeb74d4c.tar.bz2 nixlib-adbd25c75c6b2809bcd97486a22caf0cfeb74d4c.tar.lz nixlib-adbd25c75c6b2809bcd97486a22caf0cfeb74d4c.tar.xz nixlib-adbd25c75c6b2809bcd97486a22caf0cfeb74d4c.tar.zst nixlib-adbd25c75c6b2809bcd97486a22caf0cfeb74d4c.zip | |
libav: remove /bin/sh dependencies
that resulted in some Hydra build fails
Diffstat (limited to 'pkgs/development/libraries/libav')
| -rw-r--r-- | pkgs/development/libraries/libav/default.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index a069894f6c8c..317768518c39 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/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 @@ -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 |