From 6315cf18db0695cd37a907eeb6f641e2a4414fe8 Mon Sep 17 00:00:00 2001 From: Joshua Campbell Date: Fri, 22 Mar 2024 20:37:46 -0700 Subject: [PATCH 1/2] ndi: 5.6.0 -> 5.6.1 --- pkgs/development/libraries/ndi/version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ndi/version.json b/pkgs/development/libraries/ndi/version.json index 686abdb2c2b7..1631cd03e8fb 100644 --- a/pkgs/development/libraries/ndi/version.json +++ b/pkgs/development/libraries/ndi/version.json @@ -1 +1 @@ -{"hash": "sha256:4ff4b92f2c5f42d234aa7d142e2de7e9b045c72b46ad5149a459d48efd9218de", "version": "5.6.0"} +{"hash": "sha256:0wh5bqy9xx08wnfah92pgs4f6xn6mwfyhwdzbhf5ghkbw8pc7z0w", "version": "5.6.1"} From 15ee2ca47fa98561af8f4b25c26cbeddd024ca26 Mon Sep 17 00:00:00 2001 From: Joshua Campbell Date: Fri, 22 Mar 2024 20:38:09 -0700 Subject: [PATCH 2/2] ndi: update src and fix lib symlink --- pkgs/development/libraries/ndi/default.nix | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/ndi/default.nix b/pkgs/development/libraries/ndi/default.nix index 06eb1b815069..b691f2b10afa 100644 --- a/pkgs/development/libraries/ndi/default.nix +++ b/pkgs/development/libraries/ndi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, requireFile, avahi, obs-studio-plugins }: +{ lib, stdenv, fetchurl, avahi, obs-studio-plugins }: let versionJSON = lib.importJSON ./version.json; @@ -15,20 +15,10 @@ stdenv.mkDerivation rec { majorVersion = builtins.head (builtins.splitVersion version); installerName = "Install_NDI_SDK_v${majorVersion}_Linux"; - src = requireFile rec { - name = "${installerName}.tar.gz"; - sha256 = versionJSON.hash; - message = '' - In order to use NDI SDK version ${version}, you need to comply with - NewTek's license and download the appropriate Linux tarball from: - - ${meta.homepage} - - Once you have downloaded the file, please use the following command and - re-run the installation: - - \$ nix-prefetch-url file://\$PWD/${name} - ''; + src = fetchurl { + name = "${pname}-${version}.tar.gz"; + url = "https://downloads.ndi.tv/SDK/NDI_SDK_Linux/${installerName}.tar.gz"; + hash = versionJSON.hash; }; buildInputs = [ avahi ]; @@ -52,6 +42,8 @@ stdenv.mkDerivation rec { if [ -L "$i" ]; then continue; fi patchelf --set-rpath "${avahi}/lib:${stdenv.cc.libc}/lib" "$i" done + rm $out/bin/libndi.so.${majorVersion} + ln -s $out/lib/libndi.so.${version} $out/bin/libndi.so.${majorVersion} mv include examples $out/ mkdir -p $out/share/doc/${pname}-${version} mv licenses $out/share/doc/${pname}-${version}/licenses