gnu: jack-2: Fix jack_control script.

* gnu/packages/audio.scm (jack-2)[inputs]: Add python2-dbus.
[arguments]: Use python-2 and add build phase to wrap jack_control
Python script.
This commit is contained in:
Ricardo Wurmus 2015-11-19 16:07:56 +01:00
parent 80e6f37e30
commit bc8bf605fc

View file

@ -684,7 +684,8 @@ (define-public jack-2
"03b0iiyk3ng3vh5s8gaqwn565vik7910p56mlbk512bw3dhbdwc8")))) "03b0iiyk3ng3vh5s8gaqwn565vik7910p56mlbk512bw3dhbdwc8"))))
(build-system waf-build-system) (build-system waf-build-system)
(arguments (arguments
`(#:tests? #f ; no check target `(#:python ,python-2
#:tests? #f ; no check target
#:configure-flags '("--dbus" #:configure-flags '("--dbus"
"--alsa") "--alsa")
#:phases #:phases
@ -697,13 +698,22 @@ (define-public jack-2
((".*CFLAGS.*-Wall.*" m) ((".*CFLAGS.*-Wall.*" m)
(string-append m (string-append m
" conf.env.append_unique('LINKFLAGS'," " conf.env.append_unique('LINKFLAGS',"
"'-Wl,-rpath=" %output "/lib')\n")))))))) "'-Wl,-rpath=" %output "/lib')\n")))))
(add-after 'install 'wrap-python-scripts
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Make sure 'jack_control' runs with the correct PYTHONPATH.
(let* ((out (assoc-ref outputs "out"))
(path (getenv "PYTHONPATH")))
(wrap-program (string-append out "/bin/jack_control")
`("PYTHONPATH" ":" prefix (,path))))
#t)))))
(inputs (inputs
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)
("dbus" ,dbus) ("dbus" ,dbus)
("expat" ,expat) ("expat" ,expat)
("libsamplerate" ,libsamplerate) ("libsamplerate" ,libsamplerate)
("opus" ,opus) ("opus" ,opus)
("python2-dbus" ,python2-dbus)
("readline" ,readline))) ("readline" ,readline)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))