Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

ndi: 5.6.0 -> 5.6.1 + update src and fix lib symlink #298259

Merged
merged 2 commits into from May 2, 2024

Conversation

jshcmpbll
Copy link
Member

@jshcmpbll jshcmpbll commented Mar 23, 2024

Description of changes

The NDI library is currently broken. Adding a couple lines to remove the old bin -> lib symlink and update it with the correct path.

#82617 Brought up the idea of just sourcing the file for the user. I am not entirely sure how to handle the acceptance of NewTek's EULA but figured I'd get this up so others might be able to help contribute on that front.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 馃憤 reaction to pull requests you find important.

@jshcmpbll
Copy link
Member Author

Current bin symlink problem:

nixos/nixpkgs git:(master*)git --no-pager diff
diff --git a/pkgs/development/libraries/ndi/version.json b/pkgs/development/libraries/ndi/version.json
index 686abdb2c2b7..c0184c27df7e 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.0"}
nixos/nixpkgs git:(master*)export NIXPKGS_ALLOW_UNFREE=1; nix build .#ndi --impure
warning: Git tree '/home/jsh/git/nixos/nixpkgs' is dirty
nixos/nixpkgs git:(master*)ls -la result/bin
total 14493
dr-xr-xr-x 2 root root        7 Dec 31  1969 .
dr-xr-xr-x 7 root root        7 Dec 31  1969 ..
lrwxrwxrwx 1 root root       42 Dec 31  1969 libndi.so.5 -> ../../lib/x86_64-linux-gnu/libndi.so.5.6.1
-r-xr-xr-x 1 root root 23711576 Dec 31  1969 ndi-benchmark
-r-xr-xr-x 1 root root   675736 Dec 31  1969 ndi-directory-service
-r-xr-xr-x 1 root root 26545752 Dec 31  1969 ndi-free-audio
-r-xr-xr-x 1 root root 25236856 Dec 31  1969 ndi-record

@jshcmpbll
Copy link
Member Author

Linking this issue too since its relevant #219578

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/exclude-package-from-cache-nixos-org/44178/1

Copy link
Contributor

@JohnRTitor JohnRTitor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR title should be updated to indicate the version change as well.

@jshcmpbll jshcmpbll changed the title ndi: update src and fix lib symlink ndi: 5.6.0 -> 5.6.1 + update src and fix lib symlink Apr 27, 2024
@jshcmpbll
Copy link
Member Author

Updated, thanks @JohnRTitor

Copy link
Contributor

@JohnRTitor JohnRTitor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While nixpkgs review did not work, I successfully built with nix build .#ndi. It did successfully fetch and installed ndi libs.
image

Successfully built obs-studio-plugins.obs-ndi as well.

image

@JohnRTitor
Copy link
Contributor

Off to @pSub for approval.

Copy link
Contributor

@RossComputerGuy RossComputerGuy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image0

@wegank wegank merged commit 2af45f8 into NixOS:master May 2, 2024
31 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants