From 01d2d82b6a1ab9dc87db630b32b89bde201b6de6 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Sun, 1 Nov 2015 18:45:05 +0100 Subject: [PATCH] atom: unbreak build - Unbreak build - Revert "atom: broken temporarily." This reverts commit ffe2024b31939cefdf50ea6c1b1904c40269fd6e. - Revert "atom: restrict to x86_64 for now." This reverts commit 759fd69e005d1e75d315a7dcf467c4b02b4643b2. - Revert "atom: update to 1.1.0." This reverts commit edd82170526543c736004ad1e92fe1aac3256bfb. --- srcpkgs/atom/template | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/srcpkgs/atom/template b/srcpkgs/atom/template index 6e6481695d7..234629d5e01 100644 --- a/srcpkgs/atom/template +++ b/srcpkgs/atom/template @@ -4,10 +4,7 @@ version=1.1.0 revision=1 nocross=yes nostrip=yes -# XXX FAILS EVERYWHERE -only_for_archs="x86_64" -broken="http://build.voidlinux.eu/builders/x86_64_builder/builds/18095/steps/shell_3/logs/stdio" -hostmakedepends="git pkg-config python-devel nodejs" +hostmakedepends="git pkg-config python-devel curl" makedepends="python-devel GConf-devel libgnome-keyring-devel" short_desc="Chrome-based text editor from Github" maintainer="Andrea Brancaleoni " @@ -15,11 +12,21 @@ license="MIT" homepage="https://atom.io" distfiles="https://github.com/$pkgname/$pkgname/archive/v$version.tar.gz" checksum=25a64813b2741540fc26dfa0cf82e5769b324c016317fa3ff0593679fd5e88e9 +_NODE_VERSION=0.12.7 +pre_build() { + local NVM_VERSION=0.26.1 + curl -o- https://raw.githubusercontent.com/creationix/nvm/v$NVM_VERSION/install.sh | bash + source ~/.nvm/nvm.sh + nvm install $_NODE_VERSION + nvm use $_NODE_VERSION +} do_build() { script/build } do_install() { + source ~/.nvm/nvm.sh + nvm use $_NODE_VERSION script/grunt install --install-dir ${DESTDIR}/usr sed -i "s|${DESTDIR}||g" ${DESTDIR}/usr/share/applications/atom.desktop vlicense LICENSE.md