summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Peukert2023-08-27 04:38:38 +0200
committerDaniel Peukert2023-08-27 04:38:38 +0200
commit4af2fd9df0fe36b42b24a55fe8c36755f4dbb791 (patch)
tree7a2548cd2c4a1a7ec954797cceb525cee039db8a
parent7448bb07be0164668be8ba9c6d0ff87c0665600f (diff)
downloadaur-4af2fd9df0fe36b42b24a55fe8c36755f4dbb791.tar.gz
Actually fix mongodb-compass build
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD7
-rw-r--r--lerna.diff11
3 files changed, 19 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6510db38d334..f9265965afff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -21,9 +21,11 @@ pkgbase = mongodb-compass-isolated-beta
source = hadron-build-ffmpeg.diff
source = hadron-build-os-dns-native.diff
source = fix-argv.diff
+ source = lerna.diff
sha512sums = 977099bebe162e5218f4f00238ee50fc20e6e8ffd6dddc4db753b63e2584069a54e2cf7d92b1796fd1e5df79ba7efc4de772158635e353eb3683f797a2085f03
sha512sums = ec052448ea2a375941944026b7b5419d48c67c324af5b75647376737a8f0f98f544cb335c948625c2e06f779a52c58ff2996561e1db977146faef4793d41d3e5
sha512sums = e1082fd804ba72ccf3e53576077562f8b159b76e6aa07fa2324e31dd45c0d863d844fbb8be139be427e2cdd0401a2c4b8e6279ee9305c5507fbd73c5bc0df65d
sha512sums = 6621d214ac692f57e0802b7b4ac0c6a5aedf871896d084afb3939abe3b921ca0b4d9895d4fd0d14574e910681e6d17ecbd0ff321ed9f9a18e963d23da6778d0e
+ sha512sums = 2ced8f06e82a8ff5639fddb75a638bf9c1d06c8d891dd07c88dd1aa5fa00faf1d07f35f7a7d283abbac68c4ec74c750c9017c793644388c66b8027ab7acb23bd
pkgname = mongodb-compass-isolated-beta
diff --git a/PKGBUILD b/PKGBUILD
index a20110e0b3a6..dd8c0d19602e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,11 +20,13 @@ source=(
'hadron-build-ffmpeg.diff'
'hadron-build-os-dns-native.diff'
'fix-argv.diff'
+ 'lerna.diff'
)
sha512sums=('977099bebe162e5218f4f00238ee50fc20e6e8ffd6dddc4db753b63e2584069a54e2cf7d92b1796fd1e5df79ba7efc4de772158635e353eb3683f797a2085f03'
'ec052448ea2a375941944026b7b5419d48c67c324af5b75647376737a8f0f98f544cb335c948625c2e06f779a52c58ff2996561e1db977146faef4793d41d3e5'
'e1082fd804ba72ccf3e53576077562f8b159b76e6aa07fa2324e31dd45c0d863d844fbb8be139be427e2cdd0401a2c4b8e6279ee9305c5507fbd73c5bc0df65d'
- '6621d214ac692f57e0802b7b4ac0c6a5aedf871896d084afb3939abe3b921ca0b4d9895d4fd0d14574e910681e6d17ecbd0ff321ed9f9a18e963d23da6778d0e')
+ '6621d214ac692f57e0802b7b4ac0c6a5aedf871896d084afb3939abe3b921ca0b4d9895d4fd0d14574e910681e6d17ecbd0ff321ed9f9a18e963d23da6778d0e'
+ '2ced8f06e82a8ff5639fddb75a638bf9c1d06c8d891dd07c88dd1aa5fa00faf1d07f35f7a7d283abbac68c4ec74c750c9017c793644388c66b8027ab7acb23bd')
_sourcedirectory="compass-$_pkgver"
@@ -50,6 +52,9 @@ prepare() {
# Apply argv fixes
patch --forward -p1 < "$srcdir/fix-argv.diff"
+ # Running lerna with the new Nx task runner enabled causes the build to fail when not running in a clean chroot
+ patch --forward -p1 < "$srcdir/lerna.diff"
+
# Run the first part of npm run bootstrap
npm install
diff --git a/lerna.diff b/lerna.diff
new file mode 100644
index 000000000000..b84a6c2869b6
--- /dev/null
+++ b/lerna.diff
@@ -0,0 +1,11 @@
+diff --git a/lerna.json b/lerna.json
+index 2e5924d12..05a4d9fe6 100644
+--- a/lerna.json
++++ b/lerna.json
+@@ -1,4 +1,5 @@
+ {
+ "packages": ["packages/*", "configs/*", "scripts"],
+- "version": "independent"
++ "version": "independent",
++ "useNx": false
+ }