diff options
author | Robin Gloster <mail@glob.in> | 2019-10-30 01:40:49 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-31 00:10:18 +0100 |
commit | ab0cfd9e036ca83bdffb8790f7cf45179441cd93 (patch) | |
tree | 006ede78e54ee19818bb6e6830e0c2a6f93f05f2 /pkgs/applications/video | |
parent | 981ae25113c13b7989e89b8b57be25d9e186a63e (diff) |
treewide: NIX_*_COMPILE -> string
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r-- | pkgs/applications/video/aegisub/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/video/mplayer/default.nix | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index 83f7ebc29d19b..123308babeae3 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -108,9 +108,7 @@ stdenv.mkDerivation # 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" - ]; + NIX_LDFLAGS = "-lpthread"; postInstall = "ln -s $out/bin/aegisub-* $out/bin/aegisub"; diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index a75a7a11d67af..f5559e3fb6c00 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -195,11 +195,11 @@ stdenv.mkDerivation rec { echo CONFIG_MPEGAUDIODSP=yes >> config.mak ''; - NIX_LDFLAGS = with stdenv.lib; + NIX_LDFLAGS = with stdenv.lib; toString ( optional fontconfigSupport "-lfontconfig" ++ optional fribidiSupport "-lfribidi" ++ optionals x11Support [ "-lX11" "-lXext" ] - ; + ); installTargets = [ "install" ] ++ stdenv.lib.optional x11Support "install-gui"; |