me/guix
Archived
1
0
Fork 0
Code Activity

gnu: git-annex: Patch 'git-annex webapp' to use hardcoded xdg-open.

Browse source 
* gnu/packages/haskell-apps.scm (git-annex)[arguments]: Add 'patch-webapp'
phase.
[inputs]: Add xdg-utils.
This commit is contained in:
David Thompson 2023-01-06 16:06:47 -05:00
parent 8cca1a35bc
commit 6ca59eec9a
No known key found for this signature in database
GPG key ID: 8328C7470FF1D807
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gnu/packages/haskell-apps.scm
View file

@ -18,6 +18,7 @@
;;; Copyright © 2021 EuAndreh <eu@euandre.org> ;;; Copyright © 2021 EuAndreh <eu@euandre.org>
;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at> ;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2021 Morgan Smith <Morgan.J.Smith@outlook.com> ;;; Copyright © 2021 Morgan Smith <Morgan.J.Smith@outlook.com>
;;; Copyright © 2022 David Thompson <dthompson2@worcester.edu>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -42,6 +43,7 @@
#:use-module (guix build-system haskell) #:use-module (guix build-system haskell)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages gl) #:use-module (gnu packages gl)
#:use-module (gnu packages haskell) #:use-module (gnu packages haskell)
#:use-module (gnu packages haskell-check) #:use-module (gnu packages haskell-check)
@ -327,6 +329,13 @@ to @code{cabal repl}).")
(copy-file "Utility/Shell.hs" "/tmp/Shell.hs") (copy-file "Utility/Shell.hs" "/tmp/Shell.hs")
(substitute* "Utility/Shell.hs" (substitute* "Utility/Shell.hs"
(("/bin/sh") (which "sh"))))) (("/bin/sh") (which "sh")))))
(add-before 'configure 'patch-webapp
(lambda _
;; Replace loose references to xdg-open so that 'git annex
;; webapp' runs without making the user also install xdg-utils.
(substitute* '("Assistant/WebApp/DashBoard.hs"
"Utility/WebApp.hs")
(("xdg-open") (which "xdg-open")))))
(add-before 'configure 'factor-setup (add-before 'configure 'factor-setup
(lambda _ (lambda _
;; Factor out necessary build logic from the provided ;; Factor out necessary build logic from the provided
@ -471,7 +480,8 @@ to @code{cabal repl}).")
ghc-yesod-core ghc-yesod-core
ghc-yesod-form ghc-yesod-form
ghc-yesod-static ghc-yesod-static
rsync)) rsync
xdg-utils))
(propagated-inputs (propagated-inputs
(list git)) (list git))
(native-inputs (native-inputs