Skip to content

avidemux: 2.7.0 -> 2.7.1 #42218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fpletz merged 1 commit into from
Jun 19, 2018
Merged

avidemux: 2.7.0 -> 2.7.1 #42218

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions pkgs/applications/video/avidemux/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, fetchpatch, cmake, pkgconfig, lndir
{ stdenv, lib, fetchurl, cmake, pkgconfig, lndir
, zlib, gettext, libvdpau, libva, libXv, sqlite
, yasm, freetype, fontconfig, fribidi
, makeWrapper, libXext, libGLU, qttools, qtbase
Expand All @@ -25,21 +25,16 @@ assert !withQT -> default != "qt5";

stdenv.mkDerivation rec {
name = "avidemux-${version}";
version = "2.7.0";
version = "2.7.1";

src = fetchurl {
url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz";
sha256 = "1bf4l9qwxq3smc1mx5pybydc742a4qqsk17z50j9550d9iwnn7gy";
sha256 = "15g9h791qbnmycabbbl7s2b3n3xpvygm88qrfk35g2cw6957ik9w";
};

patches = [
./dynamic_install_dir.patch
./bootstrap_logging.patch
# glibc 2.27 compat
(fetchpatch {
url = https://github.com/mean00/avidemux2/commit/afdd9c4b876d77a4974d3fa7d9f25caeffbdf13d.patch;
sha256 = "0mf8vpfdqybziqsfyvxwcdm3zsmnp64293icinhvfpq9xp5b6vn6";
})
];

nativeBuildInputs = [ yasm cmake pkgconfig ];
Expand All @@ -58,7 +53,10 @@ stdenv.mkDerivation rec {
++ lib.optionals withQT [ qttools qtbase ]
++ 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
cd "$sourceRoot"
patchPhase
Expand All @@ -73,11 +71,13 @@ stdenv.mkDerivation rec {
mkdir $out
cp -R install/usr/* $out

for i in $out/bin/*; do
wrapProgram $i \
--set ADM_ROOT_DIR $out \
--prefix LD_LIBRARY_PATH ":" "${libXext}/lib"
done
${wrapProgram "$out/bin/avidemux3_cli"}

${stdenv.lib.optionalString withQT ''
${wrapProgram "$out/bin/avidemux3_qt5"} --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-${qtVersion}/plugins
${wrapProgram "$out/bin/avidemux3_jobs_qt5"} --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-${qtVersion}/plugins
''}

ln -s "$out/bin/avidemux3_${default}" "$out/bin/avidemux"

fixupPhase
Expand Down