diff --git a/projects/ncdns-nsis/build b/projects/ncdns-nsis/build index ba3a892..62c1f32 100644 --- a/projects/ncdns-nsis/build +++ b/projects/ncdns-nsis/build @@ -4,14 +4,6 @@ distdir=/var/tmp/dist/[% project %] mkdir -p "$distdir" -# We need to install a recent version of python-pefile so that it works -# in a x86_64 container: -# https://github.com/TheTorProject/tor-messenger-build/pull/10 -tar xf $rootdir/[% c('input_files_by_name/python-pefile') %] -cd $(echo [% c('input_files_by_name/python-pefile') %] | sed s/\.tar\.gz$//) -python setup.py install --user -cd .. - tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/nsis') %] export PATH="/var/tmp/dist/nsis/bin:$PATH" @@ -70,5 +62,5 @@ makensis ${NSISFLAGS} -DPOSIX_BUILD=1 -DNCDNS_PRODVER=${NCDNS_NSIS_VERSION} [% c # Working around NSIS braindamage mv "${OUTFN}" torbrowser-install-tmp.exe -python $rootdir/pe_checksum_fix.py +python3 $rootdir/pe_checksum_fix.py mv torbrowser-install-tmp2.exe [% dest_dir _ '/' _ c('filename') %] diff --git a/projects/ncdns-nsis/config b/projects/ncdns-nsis/config index 359d45a..6277cae 100644 --- a/projects/ncdns-nsis/config +++ b/projects/ncdns-nsis/config @@ -16,8 +16,7 @@ var: container: use_container: 1 deps: - - python - - python-future + - python3-pefile - unzip targets: @@ -63,6 +62,3 @@ input_files: - project: stemns name: stemns - filename: pe_checksum_fix.py - - name: python-pefile - URL: https://files.pythonhosted.org/packages/7e/9b/f99171190f04cd23768547dd34533b4016bd582842f53cd9fe9585a74c74/pefile-2017.11.5.tar.gz - sha256sum: 675c35ee0e1677db9e80d2f48d8a7ff2cf38e6207e8cd5e2a2c6d126db025854