diff options
Diffstat (limited to 'gnu/packages/wine.scm')
| -rw-r--r-- | gnu/packages/wine.scm | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 4361cccd8d..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 @@ -435,10 +434,10 @@ integrate Windows applications into your desktop.") (let* ((out (assoc-ref outputs "out")) (icd (string-append out "/share/vulkan/icd.d"))) (mkdir-p icd) - (copy-file (string-append (assoc-ref inputs "mesa") + (copy-file (search-input-file inputs "/share/vulkan/icd.d/radeon_icd.i686.json") (string-append icd "/radeon_icd.i686.json")) - (copy-file (string-append (assoc-ref inputs "mesa") + (copy-file (search-input-file inputs "/share/vulkan/icd.d/intel_icd.i686.json") (string-append icd "/intel_icd.i686.json")) (wrap-program (string-append out "/bin/wine-preloader") @@ -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" |