about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNick Cao <nickcao@nichi.co>2024-04-30 16:14:32 -0400
committerGitHub <noreply@github.com>2024-04-30 16:14:32 -0400
commite0df48703bb524c519c6497c1c81428014ab96f1 (patch)
treeb25905510ae2b7274d49679b51248009919e822e
parent6030931050bbac3174dbc4694c528ee66455f1f9 (diff)
parent8f362df896829b4620561d829ee1aa34fc45beb7 (diff)
Merge pull request #307834 from NickCao/live555
live555: fix cross compilation
-rw-r--r--pkgs/by-name/li/live555/package.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/by-name/li/live555/package.nix b/pkgs/by-name/li/live555/package.nix
index 746aa71125319..1d8091bba7ab9 100644
--- a/pkgs/by-name/li/live555/package.nix
+++ b/pkgs/by-name/li/live555/package.nix
@@ -78,8 +78,15 @@ stdenv.mkDerivation (finalAttrs: {
 
   makeFlags = [
     "PREFIX=${placeholder "out"}"
+    "C_COMPILER=$(CC)"
+    "CPLUSPLUS_COMPILER=$(CXX)"
+    "LIBRARY_LINK=$(AR) cr "
+    "LINK=$(CXX) -o "
   ];
 
+  # required for whitespaces in makeFlags
+  __structuredAttrs = true;
+
   enableParallelBuilding = true;
 
   passthru.tests = {