diff options
author | Robert Schütz <dev@schuetz-co.de> | 2021-02-08 12:18:05 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-08 12:18:05 +0100 |
commit | 9a200f609112ad08241ab07aeda2469d3b470812 (patch) | |
tree | 045bd9add85f59fc49966be976ae151a55816bc6 /pkgs/tools | |
parent | 5b6ee7a3af1e5ccc4dac97f2ef56a37099235f16 (diff) | |
parent | 8484b0bdb8dbece62a96d904da0b257bc2373a0f (diff) | |
download | nixpkgs-9a200f609112ad08241ab07aeda2469d3b470812.tar nixpkgs-9a200f609112ad08241ab07aeda2469d3b470812.tar.gz nixpkgs-9a200f609112ad08241ab07aeda2469d3b470812.tar.bz2 nixpkgs-9a200f609112ad08241ab07aeda2469d3b470812.tar.lz nixpkgs-9a200f609112ad08241ab07aeda2469d3b470812.tar.xz nixpkgs-9a200f609112ad08241ab07aeda2469d3b470812.tar.zst nixpkgs-9a200f609112ad08241ab07aeda2469d3b470812.zip |
Merge pull request #111330 from dotlambda/libav-insecure
libav: mark as insecure
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/graphics/unpaper/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/video/untrunc/default.nix | 39 |
2 files changed, 2 insertions, 41 deletions
diff --git a/pkgs/tools/graphics/unpaper/default.nix b/pkgs/tools/graphics/unpaper/default.nix index dd6ecb473e9..20dfe15dc6c 100644 --- a/pkgs/tools/graphics/unpaper/default.nix +++ b/pkgs/tools/graphics/unpaper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libav, libxslt }: +{ lib, stdenv, fetchurl, pkg-config, ffmpeg, libxslt }: stdenv.mkDerivation rec { pname = "unpaper"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libav libxslt ]; + buildInputs = [ ffmpeg libxslt ]; meta = with lib; { homepage = "https://www.flameeyes.eu/projects/unpaper"; diff --git a/pkgs/tools/video/untrunc/default.nix b/pkgs/tools/video/untrunc/default.nix deleted file mode 100644 index 3ef025f5875..00000000000 --- a/pkgs/tools/video/untrunc/default.nix +++ /dev/null @@ -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 ]; - }; -} |