[neon/qt6/qt6-webengine/Neon/unstable] debian: this one worked locally

Carlos De Maine null at kde.org
Wed Sep 6 10:30:33 BST 2023


Git commit 40355df840c54aa77dea40cf83e2d5326e5ee719 by Carlos De Maine.
Committed on 06/09/2023 at 11:30.
Pushed by carlosdem into branch 'Neon/unstable'.

this one worked locally

M  +3    -12   debian/rules

https://invent.kde.org/neon/qt6/qt6-webengine/-/commit/40355df840c54aa77dea40cf83e2d5326e5ee719

diff --git a/debian/rules b/debian/rules
index 52699aa..998fda3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,6 +45,9 @@ override_dh_auto_clean:
 
 # Turn on system FFmpeg libraries for 6.3
 override_dh_auto_configure:
+	bash -c "source ~/.nvm/nvm.sh && npm install pako && npm install rollup-plugin-terser && npm install yargs"
+
+	export PATH=~/.nvm/versions/node/v18.5.0/bin:$(PATH) && \
 	dh_auto_configure -- \
 		--log-level=STATUS \
 		-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
@@ -64,18 +67,6 @@ override_dh_auto_configure:
 		-DFEATURE_webengine_webrtc=ON \
 		-DFEATURE_webengine_webrtc-pipewire=ON
 
-# this oneshell bash snippet  init's nvm and installs the required node deps with npm. Makefile's sh doesn't
-# know bashism's and executes each line in a new shell thus losing all the env variables
-.ONESHELL:
-nvm_init_please:
-	@nvm_init_please=defined
-	source /etc/profile.d/nvm-profile.sh
-	npm install pako
-	npm install rollup-plugin-terser
-	npm install yargs
-	echo $${nvm_init_please:-undefined}
-.PHONY: nvm_init_please
-
 	# Create js files, that are needed for building step for arch and indep builds
 	cd $(CURDIR)/src/3rdparty/chromium/third_party/jstemplate/; \
 		cat util.js jsevalcontext.js jstemplate.js exports.js > jstemplate_compiled.js


More information about the Neon-commits mailing list