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

Merge pull request #42218 from Ma27/bump-avidemux

Browse Source 
avidemux: 2.7.0 -> 2.7.1
This commit is contained in:
Franz Pletz 2018-06-19 16:11:26 +00:00 committed by GitHub
commit 963de452b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/applications/video/avidemux/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, fetchpatch, cmake, pkgconfig, lndir { stdenv, lib, fetchurl, cmake, pkgconfig, lndir
, zlib, gettext, libvdpau, libva, libXv, sqlite , zlib, gettext, libvdpau, libva, libXv, sqlite
, yasm, freetype, fontconfig, fribidi , yasm, freetype, fontconfig, fribidi
, makeWrapper, libXext, libGLU, qttools, qtbase , makeWrapper, libXext, libGLU, qttools, qtbase
@ -25,21 +25,16 @@ assert !withQT -> default != "qt5";
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "avidemux-${version}"; name = "avidemux-${version}";
version = "2.7.0"; version = "2.7.1";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz"; url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz";
sha256 = "1bf4l9qwxq3smc1mx5pybydc742a4qqsk17z50j9550d9iwnn7gy"; sha256 = "15g9h791qbnmycabbbl7s2b3n3xpvygm88qrfk35g2cw6957ik9w";
}; };
patches = [ patches = [
./dynamic_install_dir.patch ./dynamic_install_dir.patch
./bootstrap_logging.patch ./bootstrap_logging.patch
# glibc 2.27 compat
(fetchpatch {
url = https://github.com/mean00/avidemux2/commit/afdd9c4b876d77a4974d3fa7d9f25caeffbdf13d.patch;
sha256 = "0mf8vpfdqybziqsfyvxwcdm3zsmnp64293icinhvfpq9xp5b6vn6";
})
]; ];
nativeBuildInputs = [ yasm cmake pkgconfig ]; nativeBuildInputs = [ yasm cmake pkgconfig ];
@ -58,7 +53,10 @@ stdenv.mkDerivation rec {
++ lib.optionals withQT [ qttools qtbase ] ++ lib.optionals withQT [ qttools qtbase ]
++ lib.optional withVPX libvpx; ++ lib.optional withVPX libvpx;
buildCommand = '' buildCommand = let
qtVersion = "5.${stdenv.lib.versions.minor qtbase.version}";
wrapProgram = f: "wrapProgram ${f} --set ADM_ROOT_DIR $out --prefix LD_LIBRARY_PATH : ${libXext}/lib";
in ''
unpackPhase unpackPhase
cd "$sourceRoot" cd "$sourceRoot"
patchPhase patchPhase
@ -73,11 +71,13 @@ stdenv.mkDerivation rec {
mkdir $out mkdir $out
cp -R install/usr/* $out cp -R install/usr/* $out
for i in $out/bin/*; do ${wrapProgram "$out/bin/avidemux3_cli"}
wrapProgram $i \
--set ADM_ROOT_DIR $out \ ${stdenv.lib.optionalString withQT ''
--prefix LD_LIBRARY_PATH ":" "${libXext}/lib" ${wrapProgram "$out/bin/avidemux3_qt5"} --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-${qtVersion}/plugins
done ${wrapProgram "$out/bin/avidemux3_jobs_qt5"} --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-${qtVersion}/plugins
''}
ln -s "$out/bin/avidemux3_${default}" "$out/bin/avidemux" ln -s "$out/bin/avidemux3_${default}" "$out/bin/avidemux"
fixupPhase fixupPhase