diff --git a/srcpkgs/budgie-desktop/patches/meson.patch b/srcpkgs/budgie-desktop/patches/meson.patch new file mode 100644 index 00000000000..f7ccca5e66b --- /dev/null +++ b/srcpkgs/budgie-desktop/patches/meson.patch @@ -0,0 +1,48 @@ +--- subprojects/gvc/meson.build.orig 2017-08-14 22:00:04.000000000 +0000 ++++ subprojects/gvc/meson.build 2017-10-10 18:10:05.177178298 +0000 +@@ -15,17 +15,17 @@ + ] + + libgvc_sources = [ +- '../../src/gvc/gvc-channel-map.c', +- '../../src/gvc/gvc-mixer-card.c', +- '../../src/gvc/gvc-mixer-control.c', +- '../../src/gvc/gvc-mixer-event-role.c', +- '../../src/gvc/gvc-mixer-sink.c', +- '../../src/gvc/gvc-mixer-sink-input.c', +- '../../src/gvc/gvc-mixer-source.c', +- '../../src/gvc/gvc-mixer-source-output.c', +- '../../src/gvc/gvc-mixer-stream.c', +- '../../src/gvc/gvc-mixer-ui-device.c', +- '../../src/gvc/test-audio-device-selection.c', ++ 'gvc-channel-map.c', ++ 'gvc-mixer-card.c', ++ 'gvc-mixer-control.c', ++ 'gvc-mixer-event-role.c', ++ 'gvc-mixer-sink.c', ++ 'gvc-mixer-sink-input.c', ++ 'gvc-mixer-source.c', ++ 'gvc-mixer-source-output.c', ++ 'gvc-mixer-stream.c', ++ 'gvc-mixer-ui-device.c', ++ 'test-audio-device-selection.c', + ] + + libgvc = static_library( +@@ -34,8 +34,7 @@ + dependencies: libgvc_deps, + include_directories: [ + include_directories('.'), + include_directories(join_paths('..', '..')), +- include_directories(join_paths('..', '..', 'src', 'gvc')), + ], + c_args: [ + '-DG_LOG_DOMAIN="Gvc"', +@@ -50,7 +49,6 @@ + link_with: libgvc, + include_directories: [ + include_directories('.'), + include_directories(join_paths('..', '..')), +- include_directories(join_paths('..', '..', 'src', 'gvc')), + ], + ) diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template index 807ba20412e..4127e46a832 100644 --- a/srcpkgs/budgie-desktop/template +++ b/srcpkgs/budgie-desktop/template @@ -19,8 +19,7 @@ homepage="https://github.com/budgie-desktop/budgie-desktop" distfiles="https://github.com/budgie-desktop/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.xz" checksum=17da8efe56a73426117f89eed8f2a1236c592042acb8d3fec063b24ebe124245 -broken="https://build.voidlinux.eu/builders/x86_64-musl_builder/builds/5182" - -pre_install() { - export LD=$CC +post_extract() { + # subprojects with overlapping source trees no longer allowed + mv src/gvc/* subprojects/gvc }