diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-01-10 13:07:21 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-01-10 13:07:21 +0100 |
| commit | 287144e34258f353425ba78817439df1f2c9e80d (patch) | |
| tree | ec96c46c08855adc24b3664395b20974bd6923ea /pkgs/applications/video | |
| parent | 528664e3bb33bae66d4ce41877fe573395010dd9 (diff) | |
| parent | e0fd84cf439f39d31e2c317b228b0c035cc6211d (diff) | |
| download | nixlib-287144e34258f353425ba78817439df1f2c9e80d.tar nixlib-287144e34258f353425ba78817439df1f2c9e80d.tar.gz nixlib-287144e34258f353425ba78817439df1f2c9e80d.tar.bz2 nixlib-287144e34258f353425ba78817439df1f2c9e80d.tar.lz nixlib-287144e34258f353425ba78817439df1f2c9e80d.tar.xz nixlib-287144e34258f353425ba78817439df1f2c9e80d.tar.zst nixlib-287144e34258f353425ba78817439df1f2c9e80d.zip | |
Merge branch 'master' into staging-next
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 = " |