From 06b6e303b02bffb16e83ec9cd41e453700371cd8 Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com>
Date: Mon, 22 Aug 2022 22:11:42 -0400
Subject: [PATCH] vid-stab: 1.1.0 -> unstable-2022-05-30, fix linking against
 it with clang

 - vid-stab 1.1.0 (current release) hardcodes libgomp in its pkg-config.
   Current git version includes a commit fixing this, so this change
   updates to the git versions
 - placing openmp in `buildInputs` causes it not to be present when
   linking against vid-stab, causing linking to fail. Move it to
   `propagatedBuildInputs` to resolve
 - the all-packages.nix change enables vid-stab in (for example) ffmpeg
   on macos (where it was previously disabled).
---
 pkgs/development/libraries/vid-stab/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix                 | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/vid-stab/default.nix b/pkgs/development/libraries/vid-stab/default.nix
index d224c2f3be58b..a1eb5cf53e5da 100644
--- a/pkgs/development/libraries/vid-stab/default.nix
+++ b/pkgs/development/libraries/vid-stab/default.nix
@@ -2,18 +2,18 @@
 
 stdenv.mkDerivation rec {
   pname = "vid.stab";
-  version = "1.1.0";
+  version = "unstable-2022-05-30";
 
   src = fetchFromGitHub {
     owner = "georgmartius";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "0a3frpm2kdbx7vszhg64p3alisag73bcspl7fp3a2f1kgq7rbh38";
+    rev = "90c76aca2cb06c3ff6f7476a7cd6851b39436656";
+    sha256 = "sha256-p1VRnkBeUpET3O2FmaJMyN5/EoSOQLdmRIVbzZcQaKY=";
   };
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs = lib.optionals stdenv.cc.isClang [ openmp ];
+  propagatedBuildInputs = lib.optionals stdenv.cc.isClang [ openmp ];
 
   meta = with lib; {
     description = "Video stabilization library";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7e905eb55423a..852414438326c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17846,7 +17846,6 @@ with pkgs;
     libmfx = if stdenv.isDarwin then null else intel-media-sdk;
     libpulseaudio = if stdenv.isDarwin then null else libpulseaudio;
     samba = if stdenv.isDarwin then null else samba;
-    vid-stab = if stdenv.isDarwin then null else vid-stab;
     inherit (darwin.apple_sdk.frameworks)
       Cocoa CoreServices CoreAudio AVFoundation MediaToolbox
       VideoDecodeAcceleration;