From f9f46dc327c7e659e84d558f1309e16e16e8245a Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 30 Oct 2019 03:23:29 +0100 Subject: treewide: NIX_*_FLAGS -> string --- pkgs/applications/video/handbrake/default.nix | 4 ++-- pkgs/applications/video/kino/default.nix | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'pkgs/applications/video') 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 ]; -- cgit 1.4.1