diff options
| author | Robin Gloster <mail@glob.in> | 2019-10-30 03:23:29 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-31 00:15:46 +0100 |
| commit | f9f46dc327c7e659e84d558f1309e16e16e8245a (patch) | |
| tree | f402e0b62191769e95e3199c3f635bb8ed7a6da3 /pkgs/applications/video | |
| parent | 5f2b92e3eca8bd2d34d98e82d63783f281363f8f (diff) | |
| download | nixpkgs-f9f46dc327c7e659e84d558f1309e16e16e8245a.tar nixpkgs-f9f46dc327c7e659e84d558f1309e16e16e8245a.tar.gz nixpkgs-f9f46dc327c7e659e84d558f1309e16e16e8245a.tar.bz2 nixpkgs-f9f46dc327c7e659e84d558f1309e16e16e8245a.tar.lz nixpkgs-f9f46dc327c7e659e84d558f1309e16e16e8245a.tar.xz nixpkgs-f9f46dc327c7e659e84d558f1309e16e16e8245a.tar.zst nixpkgs-f9f46dc327c7e659e84d558f1309e16e16e8245a.zip | |
treewide: NIX_*_FLAGS -> string
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/handbrake/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/video/kino/default.nix | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 4341055d084..59a8c2377ce 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -100,9 +100,9 @@ stdenv.mkDerivation rec { ]; # NOTE: 2018-12-27: Check NixOS HandBrake test if changing - NIX_LDFLAGS = [ + NIX_LDFLAGS = toString [ "-lx265" - # NOTE: The -ldl flag was fixed upstream for a release after 1.3.0 + # NOTE: The -ldl flag was fixed upstream for a release after 1.3.0 "-ldl" ]; diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix index 1b9f0d0997a..2a0af3ed59e 100644 --- a/pkgs/applications/video/kino/default.nix +++ b/pkgs/applications/video/kino/default.nix @@ -71,10 +71,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - NIX_LDFLAGS = [ - "-lavcodec" - "-lavutil" - ]; + 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 ]; |