aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/wine.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2021-12-13 17:18:24 +0100
committerLudovic Courtès <ludo@gnu.org>2021-12-13 17:48:25 +0100
commit8394619baceb118df92e355377fd543bb1aa501a (patch)
tree504f07c2a9f88596a305b59ef45f941062426a52 /gnu/packages/wine.scm
parentaca2defe0172868295941fd9f0e97886f6e9b2d4 (diff)
downloadguix-8394619baceb118df92e355377fd543bb1aa501a.tar
guix-8394619baceb118df92e355377fd543bb1aa501a.tar.gz
gnu: Simplify package inputs.
This commit was obtained by running: ./pre-inst-env guix style without any additional argument.
Diffstat (limited to 'gnu/packages/wine.scm')
-rw-r--r--gnu/packages/wine.scm33
1 files changed, 16 insertions, 17 deletions
diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm
index d77d1070e1..f44a402042 100644
--- a/gnu/packages/wine.scm
+++ b/gnu/packages/wine.scm
@@ -222,8 +222,8 @@ integrate Windows applications into your desktop.")
(package
(inherit wine)
(name "wine64")
- (inputs `(("wine" ,wine)
- ,@(package-inputs wine)))
+ (inputs (modify-inputs (package-inputs wine)
+ (prepend wine)))
(arguments
`(#:make-flags
(list "SHELL=bash"
@@ -325,8 +325,8 @@ integrate Windows applications into your desktop.")
(package
(inherit wine)
(name "wine-minimal")
- (native-inputs (fold alist-delete (package-native-inputs wine)
- '("gettext" "perl" "pkg-config")))
+ (native-inputs (modify-inputs (package-native-inputs wine)
+ (delete "gettext" "perl" "pkg-config")))
(inputs `())
(arguments
`(#:validate-runpath? #f
@@ -364,8 +364,7 @@ integrate Windows applications into your desktop.")
(base32 "0d5m9pvafr0iw99ny7rgzfmw7zw45q5wfcw68zj88mvzs47xkgms"))))
(build-system trivial-build-system)
(native-inputs
- `(("bash" ,bash)
- ("coreutils" ,coreutils)))
+ (list bash coreutils))
(arguments
`(#:modules ((guix build utils))
#:builder
@@ -413,15 +412,15 @@ integrate Windows applications into your desktop.")
(file-name (string-append name "-" wine-version ".tar.xz"))
(sha256
(base32 "1bc4zmqpdqs1ncz3qisp8a313pqzi5a31gq1s99ivb60vk325rcr")))))
- (inputs `(("autoconf" ,autoconf) ; for autoreconf
- ("ffmpeg" ,ffmpeg)
- ("gtk+" ,gtk+)
- ("libva" ,libva)
- ("mesa" ,mesa)
- ("python" ,python)
- ("util-linux" ,util-linux) ; for hexdump
- ("wine-staging-patchset-data" ,wine-staging-patchset-data)
- ,@(package-inputs wine)))
+ (inputs (modify-inputs (package-inputs wine)
+ (prepend autoconf ; for autoreconf
+ ffmpeg
+ gtk+
+ libva
+ mesa
+ python
+ util-linux ; for hexdump
+ wine-staging-patchset-data)))
(arguments
`(#:phases
(modify-phases %standard-phases
@@ -490,8 +489,8 @@ integrated into the main branch.")
(package
(inherit wine-staging)
(name "wine64-staging")
- (inputs `(("wine-staging" ,wine-staging)
- ,@(package-inputs wine-staging)))
+ (inputs (modify-inputs (package-inputs wine-staging)
+ (prepend wine-staging)))
(arguments
`(#:make-flags
(list "SHELL=bash"