diff options
| author | Sebastian Reuße | 2017-07-10 12:54:59 +0200 |
|---|---|---|
| committer | Sebastian Reuße | 2017-07-10 12:54:59 +0200 |
| commit | 73f6940929698545d97bb526e002239deb33c155 (patch) | |
| tree | bf7e086e464a6aa891670ed17a3320edd5c7ea2a | |
| parent | 732ccd71e2e4883142b68276772011db08290665 (diff) | |
| download | aur-git-mediate-git.tar.gz | |
Provide stronger isolation from the global package DB
Since Haskell-packages on Arch no longer ship static components, a static,
sandboxed build would fail if some dependencies are already installed globally.
To fix this, we use the Arch-supplied boot-only-libs package DB, which will
convince Cabal to reinstall our dependencies (including static components).
| -rw-r--r-- | .SRCINFO | 5 | ||||
| -rw-r--r-- | PKGBUILD | 14 |
2 files changed, 13 insertions, 6 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Wed Mar 8 13:42:41 UTC 2017 +# Mon Jul 10 10:54:59 UTC 2017 pkgbase = git-mediate-git pkgdesc = Resolve trivial conflicts automatically when merging branches in git repositories. - pkgver = r94.07b1a7b + pkgver = r98.bc59c05 pkgrel = 1 url = https://github.com/Peaker/git-mediate arch = i686 @@ -11,6 +11,7 @@ pkgbase = git-mediate-git makedepends = git makedepends = cabal-install makedepends = chrpath + makedepends = ghc-static depends = gmp depends = libffi provides = git-mediate @@ -2,7 +2,7 @@ pkgname=git-mediate-git _gitname=git-mediate pkgver=r94.07b1a7b -pkgrel=1 +pkgrel=2 pkgdesc="Resolve trivial conflicts automatically when merging branches in git repositories." arch=(i686 x86_64) url="https://github.com/Peaker/git-mediate" @@ -10,7 +10,7 @@ license=(GPL) provides=(git-mediate) conflicts=(git-mediate resolve-trivial-conflicts) replaces=(resolve-trivial-conflicts resolve-trivial-conflicts-git) -makedepends=(git cabal-install chrpath) +makedepends=(git cabal-install chrpath ghc-static) depends=(gmp libffi) source=(git+https://github.com/Peaker/git-mediate) md5sums=(SKIP) @@ -27,8 +27,14 @@ build() { cd "$_gitname" cabal update cabal sandbox init - cabal install --dependencies-only - cabal configure --prefix /usr --disable-executable-dynamic + local _pkgdb=(/usr/lib/ghc-*/static-package.conf.d) + cabal install \ + --dependencies-only \ + --ghc-pkg-option=--global-package-db="$_pkgdb" + cabal configure \ + --prefix /usr \ + --disable-executable-dynamic \ + --ghc-pkg-option=--global-package-db="$_pkgdb" cabal build } |