From 5424e680b829c72ed7531333a532643e6f62ceb3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 6 Mar 2020 15:01:08 +0100 Subject: gnu: carla: Partially fix start-up. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes but carla still fails to start. Reported by Nathan Dehnel . * gnu/packages/audio.scm (carla)[arguments]: Add ‘make-carla-executable’ phase. --- gnu/packages/audio.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 2406aa16b2..d0810bda0a 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3930,11 +3930,17 @@ as is the case with audio plugins.") (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases + (delete 'configure) ; no configure script (add-before 'build 'set-CC-variable-and-show-features (lambda _ (setenv "CC" "gcc") (invoke "make" "features"))) - (delete 'configure)))) + (add-after 'install 'make-carla-executable + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (chmod (string-append out "/share/carla/carla") #o555) + #t))) + ))) (inputs `(("alsa-lib" ,alsa-lib) ("ffmpeg" ,ffmpeg) -- cgit v1.2.3 From 522ec708bcd9d84c90b57ed6d36b3ec97cf7ba9d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 6 Mar 2020 15:39:20 +0100 Subject: gnu: Order module imports in (gnu packages audio). * gnu/packages/audio.scm: Order module imports alphabetically. --- gnu/packages/audio.scm | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index d0810bda0a..0cbed2aac4 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -45,26 +45,14 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages audio) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix git-download) - #:use-module (guix utils) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix build-system gnu) - #:use-module (guix build-system waf) - #:use-module (guix build-system trivial) - #:use-module (guix build-system cmake) - #:use-module (guix build-system meson) - #:use-module (guix build-system python) - #:use-module (guix build-system glib-or-gtk) #:use-module (gnu packages) #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) #:use-module (gnu packages avahi) - #:use-module (gnu packages boost) #:use-module (gnu packages backup) #:use-module (gnu packages base) #:use-module (gnu packages bison) + #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages curl) @@ -78,25 +66,28 @@ #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) - #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) #:use-module (gnu packages gnunet) ; libmicrohttpd #:use-module (gnu packages gperf) + #:use-module (gnu packages gtk) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) - #:use-module (gnu packages ncurses) - #:use-module (gnu packages onc-rpc) - #:use-module (gnu packages qt) #:use-module (gnu packages libbsd) - #:use-module (gnu packages linux) #:use-module (gnu packages libusb) + #:use-module (gnu packages linux) #:use-module (gnu packages llvm) + #:use-module (gnu packages maths) #:use-module (gnu packages mp3) ;taglib + #:use-module (gnu packages multiprecision) + #:use-module (gnu packages music) + #:use-module (gnu packages ncurses) + #:use-module (gnu packages onc-rpc) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) ;libsndfile, libsamplerate #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages qt) #:use-module (gnu packages rdf) #:use-module (gnu packages readline) #:use-module (gnu packages sdl) @@ -110,9 +101,18 @@ #:use-module (gnu packages xiph) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) - #:use-module (gnu packages maths) - #:use-module (gnu packages multiprecision) - #:use-module (gnu packages music) + #:use-module (guix build-system cmake) + #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system gnu) + #:use-module (guix build-system meson) + #:use-module (guix build-system python) + #:use-module (guix build-system trivial) + #:use-module (guix build-system waf) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix utils) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26)) -- cgit v1.2.3 From 1ab58a3d90cc6b0d15b5557de4cc67fee6636cb3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 6 Mar 2020 16:28:32 +0100 Subject: gnu: carla: Fix start-up. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes , properly. * gnu/packages/audio.scm (carla)[arguments]: Add ‘wrap-executables’ phase. [inputs]: Add guile-2.2. --- gnu/packages/audio.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 0cbed2aac4..6056ded2fb 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -70,6 +70,7 @@ #:use-module (gnu packages gnunet) ; libmicrohttpd #:use-module (gnu packages gperf) #:use-module (gnu packages gtk) + #:use-module (gnu packages guile) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages libbsd) @@ -3940,7 +3941,12 @@ as is the case with audio plugins.") (let ((out (assoc-ref outputs "out"))) (chmod (string-append out "/share/carla/carla") #o555) #t))) - ))) + (add-after 'install 'wrap-executables + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-script (string-append out "/bin/carla") + `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH")))) + #t)))))) (inputs `(("alsa-lib" ,alsa-lib) ("ffmpeg" ,ffmpeg) @@ -3958,7 +3964,10 @@ as is the case with audio plugins.") ("python-wrapper" ,python-wrapper) ("libx11" ,libx11) ("qtbase" ,qtbase) - ("zlib" ,zlib))) + ("zlib" ,zlib) + + ;; For WRAP-SCRIPT above. + ("guile" ,guile-2.2))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://kx.studio/Applications:Carla") -- cgit v1.2.3