[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 03/31] build: Add wrap-qt-program.
From: |
Ricardo Wurmus |
Subject: |
Re: [PATCH 03/31] build: Add wrap-qt-program. |
Date: |
Sat, 27 Aug 2016 08:30:32 +0200 |
User-agent: |
mu4e 0.9.16; emacs 25.1.1 |
David Craven <address@hidden> writes:
> * guix/build/qt-utils.scm (wrap-qt-program): New file.
Please also mention the change to MODULES in the Makefile.am. Other
than that it looks good to me.
~~ Ricardo
> ---
> Makefile.am | 1 +
> guix/build/qt-utils.scm | 40 ++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 41 insertions(+)
> create mode 100644 guix/build/qt-utils.scm
>
> diff --git a/Makefile.am b/Makefile.am
> index 8bae85e..165dfe9 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -107,6 +107,7 @@ MODULES = \
> guix/build/emacs-utils.scm \
> guix/build/graft.scm \
> guix/build/bournish.scm \
> + guix/build/qt-utils.scm \
> guix/search-paths.scm \
> guix/packages.scm \
> guix/import/utils.scm \
> diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm
> new file mode 100644
> index 0000000..48a3267
> --- /dev/null
> +++ b/guix/build/qt-utils.scm
> @@ -0,0 +1,40 @@
> +;;; GNU Guix --- Functional package management for GNU
> +;;; Copyright © 2016 David Craven <address@hidden>
> +;;;
> +;;; This file is part of GNU Guix.
> +;;;
> +;;; GNU Guix is free software; you can redistribute it and/or modify it
> +;;; under the terms of the GNU General Public License as published by
> +;;; the Free Software Foundation; either version 3 of the License, or (at
> +;;; your option) any later version.
> +;;;
> +;;; GNU Guix is distributed in the hope that it will be useful, but
> +;;; WITHOUT ANY WARRANTY; without even the implied warranty of
> +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> +;;; GNU General Public License for more details.
> +;;;
> +;;; You should have received a copy of the GNU General Public License
> +;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
> +
> +(define-module (guix build qt-utils)
> + #:use-module (guix build utils)
> + #:export (wrap-qt-program))
> +
> +(define (wrap-qt-program out program)
> + (define (suffix env-var path)
> + (let ((env-val (getenv env-var)))
> + (if env-val (string-append env-val ":" path) path)))
> +
> + (let ((qml-path (suffix "QML2_IMPORT_PATH"
> + (string-append out "/qml")))
> + (plugin-path (suffix "QT_PLUGIN_PATH"
> + (string-append out "/plugins")))
> + (xdg-data-path (suffix "XDG_DATA_DIRS"
> + (string-append out "/share")))
> + (xdg-config-path (suffix "XDG_CONFIG_DIRS"
> + (string-append out "/etc/xdg"))))
> + (wrap-program (string-append out "/bin/" program)
> + `("QML2_IMPORT_PATH" = (,qml-path))
> + `("QT_PLUGIN_PATH" = (,plugin-path))
> + `("XDG_DATA_DIRS" = (,xdg-data-path))
> + `("XDG_CONFIG_DIRS" = (,xdg-config-path)))))
[PATCH 06/31] gnu: Add kactivities-stats., David Craven, 2016/08/26