aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2017-07-23 17:04:51 -0400
committerMark H Weaver <mhw@netris.org>2017-07-23 17:04:51 -0400
commitc67d80563fc7021484602889454de534469f2785 (patch)
tree06c66c31b6d0e22fcac7f1ca1f7ac2c384fbf808 /gnu
parentfd900d68a519938e4a5064fcede5da81728d32b1 (diff)
downloadguix-c67d80563fc7021484602889454de534469f2785.tar
guix-c67d80563fc7021484602889454de534469f2785.tar.gz
gnu: ncurses/gpm: Move to (gnu packages ncurses).
This is needed to avoid compilation problems caused by the cyclic dependency between (gnu packages ncurses) and (gnu packages linux). * gnu/packages/linux.scm (ncurses/gpm): Move to ... * gnu/packages/ncurses.scm (ncurses/gpm): ... here. Fix misleading indentation. Add (gnu packages linux) to the module imports.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/linux.scm12
-rw-r--r--gnu/packages/ncurses.scm14
2 files changed, 14 insertions, 12 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index c116716e6e..456909a940 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -3013,18 +3013,6 @@ applications running on the Linux console. It allows users to select items
and copy/paste text in the console and in xterm.")
(license license:gpl2+)))
-(define-public ncurses/gpm
- (package/inherit ncurses
- (name "ncurses-with-gpm")
- (arguments
- (substitute-keyword-arguments (package-arguments ncurses)
- ((#:configure-flags cf)
- `(cons (string-append "--with-gpm="
- (assoc-ref %build-inputs "gpm")
- "/lib/libgpm.so.2") ,cf))))
- (inputs
- `(("gpm" ,gpm)))))
-
(define-public btrfs-progs
(package
(name "btrfs-progs")
diff --git a/gnu/packages/ncurses.scm b/gnu/packages/ncurses.scm
index 0b23baf129..7899f19128 100644
--- a/gnu/packages/ncurses.scm
+++ b/gnu/packages/ncurses.scm
@@ -32,6 +32,7 @@
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages swig)
+ #:use-module (gnu packages linux)
#:use-module (guix utils))
(define-public ncurses
@@ -200,6 +201,19 @@ ncursesw library provides wide character support.")
(origin-patches (package-source ncurses))
(search-patches "ncurses-CVE-2017-10684-10685.patch")))))))
+(define-public ncurses/gpm
+ (package/inherit ncurses
+ (name "ncurses-with-gpm")
+ (arguments
+ (substitute-keyword-arguments (package-arguments ncurses)
+ ((#:configure-flags cf)
+ `(cons (string-append "--with-gpm="
+ (assoc-ref %build-inputs "gpm")
+ "/lib/libgpm.so.2")
+ ,cf))))
+ (inputs
+ `(("gpm" ,gpm)))))
+
(define-public dialog
(package
(name "dialog")