diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-01-06 12:14:52 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-01-06 12:14:52 +0100 |
| commit | 10a12194e301f2ad3ff6899e022afa96af0610c8 (patch) | |
| tree | 9c33b65e84504d37635d942a91bc5aa0b075058d /pkgs/applications/video | |
| parent | 5489e49ebb5cb9b973133fcd70d3196fb12acc0b (diff) | |
| parent | 981b504ecddd981488578494304d141849697dba (diff) | |
| download | nixlib-10a12194e301f2ad3ff6899e022afa96af0610c8.tar nixlib-10a12194e301f2ad3ff6899e022afa96af0610c8.tar.gz nixlib-10a12194e301f2ad3ff6899e022afa96af0610c8.tar.bz2 nixlib-10a12194e301f2ad3ff6899e022afa96af0610c8.tar.lz nixlib-10a12194e301f2ad3ff6899e022afa96af0610c8.tar.xz nixlib-10a12194e301f2ad3ff6899e022afa96af0610c8.tar.zst nixlib-10a12194e301f2ad3ff6899e022afa96af0610c8.zip | |
Merge #53490: fix treewide linking errors after #51770
Issue #53001. This might not be all of them, but let's not wait.
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/aegisub/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/video/kino/default.nix | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index 3dd0cc5adc29..d4208aee62e0 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -48,6 +48,12 @@ stdenv.mkDerivation rec { hardeningDisable = [ "bindnow" "relro" ]; + # this is fixed upstream though not yet in an officially released version, + # should be fine remove on next release (if one ever happens) + NIX_LDFLAGS = [ + "-lpthread" + ]; + postInstall = "ln -s $out/bin/aegisub-* $out/bin/aegisub"; meta = { diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix index d6404a82bc34..4ddd84433e88 100644 --- a/pkgs/applications/video/kino/default.nix +++ b/pkgs/applications/video/kino/default.nix @@ -71,6 +71,11 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; + NIX_LDFLAGS = [ + "-lavcodec" + "-lavutil" + ]; + patches = [ ./kino-1.3.4-v4l1.patch ./kino-1.3.4-libav-0.7.patch ./kino-1.3.4-libav-0.8.patch ]; #./kino-1.3.4-libavcodec-pkg-config.patch ]; postInstall = " |