untrunc: make alias of untrunc-anthwlock
The latter has more features and doesn't depend on an outdated version of libav.
This commit is contained in:
parent
cc92cabcb4
commit
a4db89997b
|
@ -1,39 +0,0 @@
|
||||||
{ lib, stdenv, gcc, libav_12, fetchFromGitHub }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
pname = "untrunc";
|
|
||||||
version = "2020.02.09";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "ponchio";
|
|
||||||
repo = "untrunc";
|
|
||||||
rev = "4eed44283168c727ace839ff7590092fda2e0848";
|
|
||||||
sha256 = "0nfj67drc6bxqlkf8a1iazqhi0w38a7rjrb2bpa74gwq6xzygvbr";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs = [ gcc libav_12 ];
|
|
||||||
|
|
||||||
# Untrunc uses the internal libav headers 'h264dec.h' and 'config.h'.
|
|
||||||
# The latter must be created through 'configure'.
|
|
||||||
libavConfiguredSrc = libav_12.overrideAttrs (oldAttrs: {
|
|
||||||
name = "libav-configured-src";
|
|
||||||
outputs = [ "out" ];
|
|
||||||
phases = [ "unpackPhase" "patchPhase" "configurePhase" "installPhase" ];
|
|
||||||
installPhase = "cp -r . $out";
|
|
||||||
});
|
|
||||||
|
|
||||||
buildCommand = ''
|
|
||||||
mkdir -p $out/bin
|
|
||||||
g++ -o $out/bin/untrunc \
|
|
||||||
-Wno-deprecated-declarations \
|
|
||||||
$src/file.cpp $src/main.cpp $src/track.cpp $src/atom.cpp $src/mp4.cpp \
|
|
||||||
-I$libavConfiguredSrc -lavformat -lavcodec -lavutil
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Restore a damaged (truncated) mp4, m4v, mov, 3gp video from a similar, undamaged video";
|
|
||||||
license = licenses.gpl2;
|
|
||||||
homepage = "https://github.com/ponchio/untrunc";
|
|
||||||
maintainers = [ maintainers.earvstedt ];
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -709,6 +709,7 @@ mapAliases ({
|
||||||
ultrastardx-beta = ultrastardx; # added 2017-08-12
|
ultrastardx-beta = ultrastardx; # added 2017-08-12
|
||||||
unicorn-emu = unicorn; # added 2020-10-29
|
unicorn-emu = unicorn; # added 2020-10-29
|
||||||
unifiStable = unifi6; # added 2020-12-28
|
unifiStable = unifi6; # added 2020-12-28
|
||||||
|
untrunc = untrunc-anthwlock; # added 2021-02-01
|
||||||
usb_modeswitch = usb-modeswitch; # added 2016-05-10
|
usb_modeswitch = usb-modeswitch; # added 2016-05-10
|
||||||
usbguard-nox = usbguard; # added 2019-09-04
|
usbguard-nox = usbguard; # added 2019-09-04
|
||||||
utillinux = util-linux; # added 2020-11-24
|
utillinux = util-linux; # added 2020-11-24
|
||||||
|
|
|
@ -8527,8 +8527,6 @@ in
|
||||||
|
|
||||||
untex = callPackage ../tools/text/untex { };
|
untex = callPackage ../tools/text/untex { };
|
||||||
|
|
||||||
untrunc = callPackage ../tools/video/untrunc { };
|
|
||||||
|
|
||||||
untrunc-anthwlock = callPackage ../tools/video/untrunc-anthwlock { };
|
untrunc-anthwlock = callPackage ../tools/video/untrunc-anthwlock { };
|
||||||
|
|
||||||
up = callPackage ../tools/misc/up { };
|
up = callPackage ../tools/misc/up { };
|
||||||
|
|
Loading…
Reference in a new issue