diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2022-06-23 06:52:25 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-23 06:52:25 +0000 |
| commit | e5bb97751cbc401d769e3a1962f7cd05cf97e08a (patch) | |
| tree | d07cc5b5fe9ad081c763a55ac25524d6a17e2bbe | |
| parent | a2dbba380ba902e7acfec9bb9332cf9bbd566c68 (diff) | |
| parent | bab3fd7c37ee8a5cfd4af960799f08360a3a96aa (diff) | |
| download | nixpkgs-e5bb97751cbc401d769e3a1962f7cd05cf97e08a.tar nixpkgs-e5bb97751cbc401d769e3a1962f7cd05cf97e08a.tar.gz nixpkgs-e5bb97751cbc401d769e3a1962f7cd05cf97e08a.tar.bz2 nixpkgs-e5bb97751cbc401d769e3a1962f7cd05cf97e08a.tar.lz nixpkgs-e5bb97751cbc401d769e3a1962f7cd05cf97e08a.tar.xz nixpkgs-e5bb97751cbc401d769e3a1962f7cd05cf97e08a.tar.zst nixpkgs-e5bb97751cbc401d769e3a1962f7cd05cf97e08a.zip | |
Merge pull request #178647 from trofi/parallel-harvid
harvid: fix pending upstream inclusion to support parallel builds
| -rw-r--r-- | pkgs/tools/video/harvid/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/tools/video/harvid/default.nix b/pkgs/tools/video/harvid/default.nix index 729c26de57e..90ed6d42586 100644 --- a/pkgs/tools/video/harvid/default.nix +++ b/pkgs/tools/video/harvid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ffmpeg, libjpeg, libpng, pkg-config }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, ffmpeg, libjpeg, libpng, pkg-config }: stdenv.mkDerivation rec { pname = "harvid"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-qt6aep7iMF8/lnlT2wLqu6LkFDqzdfsGLZvrOlXttG8="; }; + patches = [ + # Fix pending upstream inclusion to support parallel builds: + # https://github.com/x42/harvid/pull/10 + (fetchpatch { + name = "parallel-build.patch"; + url = "https://github.com/x42/harvid/commit/a3f85c57ad2559558706d9b22989de36452704d9.patch"; + sha256 = "sha256-0aBfM/4XEqM7C1nFw996IVwaeL0tNgMUQ1C3kblOobI="; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ffmpeg libjpeg libpng ]; |