summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJordan MacDonald2018-11-22 23:58:12 -0500
committerJordan MacDonald2018-11-22 23:58:12 -0500
commitfc51d62d74e8f14609c3f4acff9bf94caf0b1290 (patch)
tree98f7fc3960d04c01b02094a83ec21221f252a869
parent66d17d72357937031cccadd2ccc78c0a9734b692 (diff)
downloadaur-fc51d62d74e8f14609c3f4acff9bf94caf0b1290.tar.gz
Add python => python2 shim
Termbox uses an outdated version of waf during its build that doesn't work with Python 3.7. This change patches the install process to point the python executable to Arch's python2 package executable, instead.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD18
-rwxr-xr-xpython3
3 files changed, 20 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5524d0ea5102..b5797413c67b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,11 +7,13 @@ pkgbase = amp
license = GPL3
makedepends = rust
makedepends = git
- makedepends = python
+ makedepends = python2
makedepends = cmake
makedepends = libxcb
depends = libxcb
+ source = python
source = https://github.com/jmacdonald/amp/archive/0.5.2.tar.gz
+ sha512sums = c9fe91a5958a04fcb6039d0791ac14c014ad0b85b0b30118574c64596169a71261037e2eb26c0b5cee686c90f56a5b04ffef96b0ccb455bcc3d7cc989434bcef
sha512sums = 2e3e9bcac33cc47308bbf062a6bb6fa763567fcc760c0bee18eec78829201f568e53c7e68984ba8fbb3bee6a1454fd98fe50c00047bb569754f3cd4e96de0166
pkgname = amp
diff --git a/PKGBUILD b/PKGBUILD
index cdcc40228fee..a486442dcb5a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,28 @@
# Maintainer: Jordan MacDonald <jordan(at)wastedintelligence(dot)com>
pkgname=amp
pkgver=0.5.2
-pkgrel=1
+pkgrel=2
pkgdesc='A modal text editor for the terminal.'
arch=('x86_64')
url='https://github.com/jmacdonald/amp'
license=('GPL3')
depends=('libxcb')
-makedepends=('rust' 'git' 'python' 'cmake' 'libxcb')
-source=("https://github.com/jmacdonald/$pkgname/archive/$pkgver.tar.gz")
-sha512sums=('2e3e9bcac33cc47308bbf062a6bb6fa763567fcc760c0bee18eec78829201f568e53c7e68984ba8fbb3bee6a1454fd98fe50c00047bb569754f3cd4e96de0166')
+makedepends=('rust' 'git' 'python2' 'cmake' 'libxcb')
+source=('python' "https://github.com/jmacdonald/$pkgname/archive/$pkgver.tar.gz")
+sha512sums=(
+ 'c9fe91a5958a04fcb6039d0791ac14c014ad0b85b0b30118574c64596169a71261037e2eb26c0b5cee686c90f56a5b04ffef96b0ccb455bcc3d7cc989434bcef'
+ '2e3e9bcac33cc47308bbf062a6bb6fa763567fcc760c0bee18eec78829201f568e53c7e68984ba8fbb3bee6a1454fd98fe50c00047bb569754f3cd4e96de0166'
+)
build() {
cd "$pkgname-$pkgver"
+
+ # Set up python => python2 shim.
+ rm -rf python_bin
+ mkdir python_bin
+ cp ../python python_bin/
+ export PATH="$(pwd)/python_bin:$PATH"
+
cargo build --release
}
diff --git a/python b/python
new file mode 100755
index 000000000000..01d11706d227
--- /dev/null
+++ b/python
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+python2 "$@"