cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

harvid: fix pending upstream inclusion to support parallel builds

Browse source 
Without the change parallel build fails as:

    make -C src
    make[1]: Entering directory '/build/harvid/src'
    ld -r -b binary -o seek.o ../doc/seek.js
    ld -r -b binary -o logo.o ../doc/harvid.jpg
    make[1]: *** No rule to make target '../libharvid/libharvid.a', needed by 'harvid'.  Stop.
This commit is contained in:
Sergei Trofimovich 2022-06-22 23:34:12 +01:00
parent 6c189d264e
commit bab3fd7c37
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/tools/video/harvid/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, ffmpeg, libjpeg, libpng, pkg-config }: { lib, stdenv, fetchFromGitHub, fetchpatch, ffmpeg, libjpeg, libpng, pkg-config }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "harvid"; pname = "harvid";
@ -11,6 +11,16 @@ stdenv.mkDerivation rec {
sha256 = "sha256-qt6aep7iMF8/lnlT2wLqu6LkFDqzdfsGLZvrOlXttG8="; 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 ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ ffmpeg libjpeg libpng ]; buildInputs = [ ffmpeg libjpeg libpng ];