diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-03-01 19:42:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-01 19:42:18 +0000 |
| commit | fd9ce6cb741dc9e819b754f00b4d9386d57b472f (patch) | |
| tree | c2e5dbb7a675d822a17ae8d49348373a5c257e01 | |
| parent | 9f4b1ee6867a2734f7b22d67d7b13fdb4e52e715 (diff) | |
| parent | f9f360883bd8e9c7f716f9a5fad9c8ae333f78aa (diff) | |
| download | nixpkgs-fd9ce6cb741dc9e819b754f00b4d9386d57b472f.tar nixpkgs-fd9ce6cb741dc9e819b754f00b4d9386d57b472f.tar.gz nixpkgs-fd9ce6cb741dc9e819b754f00b4d9386d57b472f.tar.bz2 nixpkgs-fd9ce6cb741dc9e819b754f00b4d9386d57b472f.tar.lz nixpkgs-fd9ce6cb741dc9e819b754f00b4d9386d57b472f.tar.xz nixpkgs-fd9ce6cb741dc9e819b754f00b4d9386d57b472f.tar.zst nixpkgs-fd9ce6cb741dc9e819b754f00b4d9386d57b472f.zip | |
Merge pull request #36167 from erikarvstedt/untrunc
untrunc: init at 2018.01.13
| -rw-r--r-- | lib/maintainers.nix | 1 | ||||
| -rw-r--r-- | pkgs/tools/video/untrunc/default.nix | 39 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 42 insertions, 0 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 76379a02ffb..106d5dfd373 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -199,6 +199,7 @@ dzabraev = "Maksim Dzabraev <dzabraew@gmail.com>"; e-user = "Alexander Kahl <nixos@sodosopa.io>"; earldouglas = "James Earl Douglas <james@earldouglas.com>"; + earvstedt = "Erik Arvstedt <erik.arvstedt@gmail.com>"; ebzzry = "Rommel Martinez <ebzzry@ebzzry.io>"; edanaher = "Evan Danaher <nixos@edanaher.net>"; edef = "edef <edef@edef.eu>"; diff --git a/pkgs/tools/video/untrunc/default.nix b/pkgs/tools/video/untrunc/default.nix new file mode 100644 index 00000000000..c51c23d62f0 --- /dev/null +++ b/pkgs/tools/video/untrunc/default.nix @@ -0,0 +1,39 @@ +{ stdenv, gcc, libav_12, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "untrunc-${version}"; + version = "2018.01.13"; + + src = fetchFromGitHub { + owner = "ponchio"; + repo = "untrunc"; + rev = "3a2e6d0718faf06589f7b9d95c8f966348e537f7"; + sha256 = "03ka4lr69k7mikfpcpd95smzdj62v851ididnjyps5a0j06f8087"; + }; + + 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 stdenv.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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 64d2aa8e7dc..f817bc5a3ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5140,6 +5140,8 @@ with pkgs; untex = callPackage ../tools/text/untex { }; + untrunc = callPackage ../tools/video/untrunc { }; + upx = callPackage ../tools/compression/upx { }; uqmi = callPackage ../tools/networking/uqmi { }; |