--- Begin Message ---
Subject: |
[PATCH 1/1] gnu: torsocks: Patch references to 'getcap' and 'which'. |
Date: |
Fri, 7 Apr 2017 09:05:11 -0500 |
* gnu/packages/tor.scm (torsocks)[inputs,arguments]: New fields.
---
gnu/packages/tor.scm | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm
index e48017e64..06b6c4feb 100644
--- a/gnu/packages/tor.scm
+++ b/gnu/packages/tor.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2016 Efraim Flashner <address@hidden>
;;; Copyright © 2016, 2017 ng0 <address@hidden>
;;; Copyright © 2017 Tobias Geerinckx-Rice <address@hidden>
+;;; Copyright © 2017 Eric Bavier <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -28,7 +29,9 @@
#:use-module (guix build-system gnu)
#:use-module (guix build-system python)
#:use-module (gnu packages)
+ #:use-module (gnu packages base)
#:use-module (gnu packages libevent)
+ #:use-module (gnu packages linux)
#:use-module (gnu packages compression)
#:use-module (gnu packages pcre)
#:use-module (gnu packages python)
@@ -88,6 +91,19 @@ the application layer) you need to install @code{torsocks}.")
(base32
"0byr9ga9w79qz4vp0m11sbmspad7fsal9wm67r4znzb7zb7cis19"))))
(build-system gnu-build-system)
+ (inputs
+ `(("which" ,which)
+ ("libcap" ,libcap)))
+ (arguments
+ `(#:phases (modify-phases %standard-phases
+ (add-after 'build 'absolutize
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/bin/torsocks"
+ (("getcap=`.*`")
+ (string-append "getcap=" (which "getcap")))
+ (("`which")
+ (string-append "`" (which "which"))))
+ #t)))))
(home-page "https://www.torproject.org/")
(synopsis "Use socks-friendly applications with Tor")
(description
--
2.12.2
--- End Message ---
--- Begin Message ---
Subject: |
Re: bug#26392: [PATCH 1/1] gnu: torsocks: Patch references to 'getcap' and 'which'. |
Date: |
Mon, 10 Apr 2017 08:50:55 -0500 |
On Mon, 10 Apr 2017 11:48:11 +0200
address@hidden (Ludovic Courtès) wrote:
> Eric Bavier <address@hidden> skribis:
>
> > * gnu/packages/tor.scm (torsocks)[inputs,arguments]: New fields.
>
> LGTM, thanks!
>
> Ludo'.
Didn't realize the cover-letter was sent to a separate bug. Closing
this one too.
Pushed in f3cf25c3c2aef91a47b790fe69b5008cdb6a6316
`~Eric
--- End Message ---