diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2018-10-09 10:32:16 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2018-10-09 10:33:07 +0300 |
| commit | 8d18edde755f4bf5b4723fc9ce89e1cd831d2b7b (patch) | |
| tree | a1e1d578769dda8c67c68c5f9be4ef9e988a24a8 | |
| parent | 31f45cf7be18d1cfc46a0ae785a3057227c4b185 (diff) | |
* gnu: agg: Replace bootstrap phase.
* gnu/packages/graphics.scm (agg)[arguments]: Remove custom 'autoreconf
phase and replace default 'bootstrap phase. Use INVOKE.
[native-inputs]: Remove bash.
| -rw-r--r-- | gnu/packages/graphics.scm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 79fd134bbe3..c3c1a4a580b 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm | |||
| @@ -709,17 +709,16 @@ and understanding different BRDFs (and other component functions).") | |||
| 709 | "--disable-examples") | 709 | "--disable-examples") |
| 710 | #:phases | 710 | #:phases |
| 711 | (modify-phases %standard-phases | 711 | (modify-phases %standard-phases |
| 712 | (add-after 'unpack 'autoreconf | 712 | (replace 'bootstrap |
| 713 | (lambda _ | 713 | (lambda _ |
| 714 | ;; let's call configure from configure phase and not now | 714 | ;; let's call configure from configure phase and not now |
| 715 | (substitute* "autogen.sh" (("./configure") "# ./configure")) | 715 | (substitute* "autogen.sh" (("./configure") "# ./configure")) |
| 716 | (zero? (system* "sh" "autogen.sh"))))))) | 716 | (invoke "sh" "autogen.sh")))))) |
| 717 | (native-inputs | 717 | (native-inputs |
| 718 | `(("pkg-config" ,pkg-config) | 718 | `(("pkg-config" ,pkg-config) |
| 719 | ("libtool" ,libtool) | 719 | ("libtool" ,libtool) |
| 720 | ("autoconf" ,autoconf) | 720 | ("autoconf" ,autoconf) |
| 721 | ("automake" ,automake) | 721 | ("automake" ,automake))) |
| 722 | ("bash" ,bash))) | ||
| 723 | (inputs | 722 | (inputs |
| 724 | `(("libx11" ,libx11) | 723 | `(("libx11" ,libx11) |
| 725 | ("freetype" ,freetype) | 724 | ("freetype" ,freetype) |
