diff --git a/radix/packages/music.scm b/radix/packages/music.scm index b906982..9ddc2c4 100644 --- a/radix/packages/music.scm +++ b/radix/packages/music.scm @@ -6,19 +6,27 @@ #:use-module (guix utils) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages algebra) + #:use-module (gnu packages audio) + #:use-module (gnu packages commencement) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages image-viewers) + #:use-module (gnu packages mp3) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pulseaudio) + #:use-module (gnu packages stb) #:use-module (gnu packages video) #:use-module (gnu packages xiph) - #:use-module (radix packages golang)) + #:use-module (radix packages audio) + #:use-module (radix packages golang) + #:use-module (radix packages stb)) (define-public kew (package (name "kew") - (version "2.6.0") + (version "3.0.0") (source (origin (method git-fetch) (uri (git-reference @@ -26,32 +34,54 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0638rarv6fl1j9zvlwd2wxpk44p1i3fzm1qz4k2ipsg2hvp5q3fm")))) + (base32 "04b3dgmbmh2rm2jix8zqg2h5prrwk9a00bk39bnzxhq012f1whf3")))) (build-system gnu-build-system) (arguments (list #:tests? #f #:make-flags - #~(list (string-append "PREFIX=" (assoc-ref %outputs "out")) - (string-append "CC=" #$(cc-for-target)) - (string-append "PKG_CONFIG=" #$(pkg-config-for-target)) - (string-append "PKG_CONFIG_PATH=" - #$(this-package-input "glib") "/include/glib-2.0" - ":" #$(this-package-input "fftwf") "/include")) + #~(let ((chafa #$(this-package-native-input "chafa")) + (gcc-toolchain #$(this-package-native-input "gcc-toolchain")) + (gdk-pixbuf #$(this-package-native-input "gdk-pixbuf")) + (glib #$(this-package-native-input "glib")) + (opusfile #$(this-package-native-input "opusfile")) + (stb-image #$(this-package-native-input "stb-image")) + (stb-image-resize2 #$(this-package-native-input "stb-image-resize2"))) + (list (string-append "PREFIX=" (assoc-ref %outputs "out")) + (string-append "CFLAGS=" + "-fPIE " + "-I" chafa "/include/chafa " + "-I" chafa "/lib/chafa/include " + "-I" gcc-toolchain "/include " + "-I" gdk-pixbuf "/include/gdk-pixbuf-2.0 " + "-I" glib "/include/glib-2.0 " + "-I" glib "/lib/glib-2.0/include " + "-I" opusfile "/include/opus " + "-I" stb-image "/include " + "-I" stb-image-resize2 "/include "))) #:phases #~(modify-phases %standard-phases (delete 'configure)))) (native-inputs - (list pkg-config)) - (inputs (list chafa - ffmpeg fftwf - freeimage + gcc-toolchain + gdk-pixbuf glib - libvorbis - opus + libogg + libnotify + miniaudio opusfile - libnotify)) + pkg-config + stb-image + stb-image-resize2 + taglib)) + (inputs + (list faad2 + freeimage + libvorbis + opus)) + (propagated-inputs + (list pulseaudio)) (synopsis "A command-line music player.") (description "A command-line music player.") (home-page "https://github.com/ravachol/kew")