From de79009ed90a884194d9600984bcaf80e8b75a63 Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Wed, 9 Oct 2024 20:48:34 +0800 Subject: [PATCH 1/2] uxplay: correct nativeBuildInputs and buildInputs --- pkgs/by-name/ux/uxplay/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ux/uxplay/package.nix b/pkgs/by-name/ux/uxplay/package.nix index 007685019d15f..6d6952c744767 100644 --- a/pkgs/by-name/ux/uxplay/package.nix +++ b/pkgs/by-name/ux/uxplay/package.nix @@ -3,13 +3,13 @@ stdenv, fetchFromGitHub, cmake, - openssl, - libplist, pkg-config, wrapGAppsHook3, avahi, avahi-compat, gst_all_1, + libplist, + openssl, nix-update-script, }: @@ -32,8 +32,6 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - openssl - libplist pkg-config wrapGAppsHook3 ]; @@ -47,6 +45,8 @@ stdenv.mkDerivation (finalAttrs: { gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gst_all_1.gst-libav + libplist + openssl ]; passthru.updateScript = nix-update-script { }; From af422170e77243a9f0eaa8ce298840799c69f9ac Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Wed, 9 Oct 2024 20:55:55 +0800 Subject: [PATCH 2/2] uxplay: fix build on darwin --- pkgs/by-name/ux/uxplay/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ux/uxplay/package.nix b/pkgs/by-name/ux/uxplay/package.nix index 6d6952c744767..e8430e5a95119 100644 --- a/pkgs/by-name/ux/uxplay/package.nix +++ b/pkgs/by-name/ux/uxplay/package.nix @@ -26,8 +26,9 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace lib/CMakeLists.txt \ + --replace "APPLE" "FALSE" \ --replace ".a" "${stdenv.hostPlatform.extensions.sharedLibrary}" - sed -i '/PKG_CONFIG_EXECUTABLE/d' renderers/CMakeLists.txt + sed -i -e '/PKG_CONFIG_EXECUTABLE/d' -e '/PKG_CONFIG_PATH/d' renderers/CMakeLists.txt ''; nativeBuildInputs = [