commit c516d10f95d38f3ed3df6ce5acd00dc5902d8eaf · pyrox.dev/nixpkgs

pyrox.dev / nixpkgs

lol

fork atom

librist: fix darwin

https://code.videolan.org/rist/librist/-/tags/v0.2.11 uses `brew` to
augment the include path which breaks with nixpkgs

Reno Dakota 1 year ago c516d10f 49472e24

+19

2 changed files

expand all

unified split

pkgs

by-name

librist

no-brew-darwin.diff

package.nix

+14

pkgs/by-name/li/librist/no-brew-darwin.diff

···

··· 1 + diff --git a/meson.build b/meson.build 2 + index 05d00b3..b923958 100755 3 + --- a/meson.build 4 + +++ b/meson.build 5 + @@ -39,7 +39,8 @@ deps = [] 6 + platform_files = [] 7 + inc = [] 8 + inc += include_directories('.', 'src', 'include/librist', 'include', 'contrib') 9 + -if (host_machine.system() == 'darwin') 10 + +if (host_machine.system() == 'darwin' 11 + + and find_program('brew', required : false).found()) 12 + r = run_command('brew', '--prefix', check: true) 13 + brewoutput = r.stdout().strip() 14 + inc += include_directories(brewoutput + '/include')

pkgs/by-name/li/librist/package.nix

··· 22 hash = "sha256-xWqyQl3peB/ENReMcDHzIdKXXCYOJYbhhG8tcSh36dY="; 23 }; 24 25 nativeBuildInputs = [ 26 meson 27 ninja

··· 22 hash = "sha256-xWqyQl3peB/ENReMcDHzIdKXXCYOJYbhhG8tcSh36dY="; 23 }; 24 25 + patches = [ 26 + # https://code.videolan.org/rist/librist/-/issues/192 27 + ./no-brew-darwin.diff 28 + ]; 29 + 30 nativeBuildInputs = [ 31 meson 32 ninja