From c516d10f95d38f3ed3df6ce5acd00dc5902d8eaf Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Fri, 13 Dec 2024 13:57:59 -0800 Subject: [PATCH 1/2] librist: fix darwin https://code.videolan.org/rist/librist/-/tags/v0.2.11 uses `brew` to augment the include path which breaks with nixpkgs --- pkgs/by-name/li/librist/no-brew-darwin.diff | 14 ++++++++++++++ pkgs/by-name/li/librist/package.nix | 5 +++++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/by-name/li/librist/no-brew-darwin.diff diff --git a/pkgs/by-name/li/librist/no-brew-darwin.diff b/pkgs/by-name/li/librist/no-brew-darwin.diff new file mode 100644 index 000000000000..dce4a5c4c628 --- /dev/null +++ b/pkgs/by-name/li/librist/no-brew-darwin.diff @@ -0,0 +1,14 @@ +diff --git a/meson.build b/meson.build +index 05d00b3..b923958 100755 +--- a/meson.build ++++ b/meson.build +@@ -39,7 +39,8 @@ deps = [] + platform_files = [] + inc = [] + inc += include_directories('.', 'src', 'include/librist', 'include', 'contrib') +-if (host_machine.system() == 'darwin') ++if (host_machine.system() == 'darwin' ++ and find_program('brew', required : false).found()) + r = run_command('brew', '--prefix', check: true) + brewoutput = r.stdout().strip() + inc += include_directories(brewoutput + '/include') diff --git a/pkgs/by-name/li/librist/package.nix b/pkgs/by-name/li/librist/package.nix index 77d1592e82af..2ec83378faeb 100644 --- a/pkgs/by-name/li/librist/package.nix +++ b/pkgs/by-name/li/librist/package.nix @@ -22,6 +22,11 @@ stdenv.mkDerivation rec { hash = "sha256-xWqyQl3peB/ENReMcDHzIdKXXCYOJYbhhG8tcSh36dY="; }; + patches = [ + # https://code.videolan.org/rist/librist/-/issues/192 + ./no-brew-darwin.diff + ]; + nativeBuildInputs = [ meson ninja From ab935537ea1973b933082a3628ed4df330311a4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 14 Dec 2024 20:11:32 +0100 Subject: [PATCH 2/2] librist: avoid rebuild on Linux for now --- pkgs/by-name/li/librist/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/li/librist/package.nix b/pkgs/by-name/li/librist/package.nix index 2ec83378faeb..8e19eb061555 100644 --- a/pkgs/by-name/li/librist/package.nix +++ b/pkgs/by-name/li/librist/package.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { hash = "sha256-xWqyQl3peB/ENReMcDHzIdKXXCYOJYbhhG8tcSh36dY="; }; - patches = [ + # avoid rebuild on Linux for now + patches = lib.optionals stdenv.isDarwin [ # https://code.videolan.org/rist/librist/-/issues/192 ./no-brew-darwin.diff ];