diff --git a/skg/packages/libadlmidi.scm b/skg/packages/libadlmidi.scm deleted file mode 100644 index ffca84a..0000000 --- a/skg/packages/libadlmidi.scm +++ /dev/null @@ -1,29 +0,0 @@ -(define-module (skg packages libadlmidi) - #:use-module (guix) - #:use-module (guix build-system gnu) - #:use-module (guix build-system cmake) - #:use-module (guix git-download) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (gnu packages)) - -(define-public libadlmidi - (package - (name "libadlmidi") - (version "1.5.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Wohlstand/libADLMIDI.git") - (commit "v1.5.1"))) - (file-name (git-file-name name version)) - (sha256 (base32 "0lk61j72c1qwpq0a68vkpw7qiyv2byv7852iz4mvcivsi9gmlr6l")))) - (build-system cmake-build-system) - (arguments (list - #:tests? #f - #:build-type "Release")) - (home-page "https://github.com/Wohlstand/libADLMIDI") - (synopsis "libADLMIDI is a free Software MIDI synthesizer library with OPL3 emulation") - (description "A Software MIDI Synthesizer library with OPL3 (YMF262) emulator ") - (license license:lgpl3))) - diff --git a/skg/packages/sdl_audiolib.scm b/skg/packages/sdl-audiolib.scm similarity index 70% rename from skg/packages/sdl_audiolib.scm rename to skg/packages/sdl-audiolib.scm index 2f3ed04..55bdc8e 100644 --- a/skg/packages/sdl_audiolib.scm +++ b/skg/packages/sdl-audiolib.scm @@ -1,4 +1,4 @@ -(define-module (skg packages sdl_audiolib) +(define-module (skg packages sdl-audiolib) #:use-module (guix) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) @@ -6,13 +6,33 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) #:use-module (gnu packages sdl) - #:use-module (skg packages libadlmidi) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages mp3) #:use-module (gnu packages audio) #:use-module (gnu packages xiph)) +(define-public libadlmidi + (package + (name "libadlmidi") + (version "1.5.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Wohlstand/libADLMIDI.git") + (commit "v1.5.1"))) + (file-name (git-file-name name version)) + (sha256 (base32 "0lk61j72c1qwpq0a68vkpw7qiyv2byv7852iz4mvcivsi9gmlr6l")))) + (build-system cmake-build-system) + (arguments (list + #:tests? #f + #:build-type "Release")) + (home-page "https://github.com/Wohlstand/libADLMIDI") + (synopsis "libADLMIDI is a free Software MIDI synthesizer library with OPL3 emulation") + (description "A Software MIDI Synthesizer library with OPL3 (YMF262) emulator ") + (license license:lgpl3))) + (define-public sdl_audiolib (package (name "sdl_audiolib")