From de9e48264e682baca087f04ddbbc1184bf31fa85 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 10 Jul 2016 14:20:04 +0200 Subject: cleanup --- customized/jack2.nix | 49 -------------------- customized/mpd.nix | 126 --------------------------------------------------- 2 files changed, 175 deletions(-) delete mode 100644 customized/jack2.nix delete mode 100644 customized/mpd.nix diff --git a/customized/jack2.nix b/customized/jack2.nix deleted file mode 100644 index 1a7b0adc..00000000 --- a/customized/jack2.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv, fetchurl, alsaLib, expat, libsamplerate -, libsndfile, makeWrapper, pkgconfig, python -, firewireSupport ? false, ffado ? null, bash }: - -assert firewireSupport -> ffado != null; - -stdenv.mkDerivation rec { - name = "jack2-${version}"; - version = "1.9.10"; - - src = fetchurl { - urls = [ - https://github.com/jackaudio/jack2/archive/v1.9.10.tar.gz - ]; - sha256 = "03b0iiyk3ng3vh5s8gaqwn565vik7910p56mlbk512bw3dhbdwc8"; - }; - - buildInputs = - [ alsaLib expat libsamplerate libsndfile makeWrapper - pkgconfig python - ] ++ (stdenv.lib.optional firewireSupport ffado); - - patchPhase = '' - substituteInPlace svnversion_regenerate.sh --replace /bin/bash ${bash}/bin/bash - ''; - - configurePhase = '' - python waf configure --prefix=$out --alsa ${if firewireSupport then "--firewire" else ""} - ''; - - buildPhase = "python waf build"; - - installPhase = '' - python waf install - wrapProgram $out/bin/jack_control --set PYTHONPATH $PYTHONPATH - for bin in $out/bin/*; do - wrapProgram $bin \ - --set JACK_PROMISCUOUS_SERVER 1 \ - --run "umask 0" - done - ''; - - meta = with stdenv.lib; { - description = "JACK audio connection kit, version 2 with jackdbus"; - homepage = "http://jackaudio.org"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/customized/mpd.nix b/customized/mpd.nix deleted file mode 100644 index 7500bd62..00000000 --- a/customized/mpd.nix +++ /dev/null @@ -1,126 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, systemd, boost -, alsaSupport ? true, alsaLib -, flacSupport ? true, flac -, vorbisSupport ? true, libvorbis -, madSupport ? true, libmad -, id3tagSupport ? true, libid3tag -, mikmodSupport ? true, libmikmod -, shoutSupport ? true, libshout -, sqliteSupport ? true, sqlite -, curlSupport ? true, curl -, audiofileSupport ? true, audiofile -, bzip2Support ? true, bzip2 -, ffmpegSupport ? true, ffmpeg -, fluidsynthSupport ? true, fluidsynth -, zipSupport ? true, zziplib -, samplerateSupport ? true, libsamplerate -, mmsSupport ? true, libmms -, mpg123Support ? true, mpg123 -, aacSupport ? true, faad2 -, pulseaudioSupport ? true, pulseaudio -, jackSupport ? true, jack2 -, gmeSupport ? true, game-music-emu -, icuSupport ? true, icu -, clientSupport ? false, mpd_clientlib -, opusSupport ? true, libopus -, makeWrapper -}: - -let - opt = stdenv.lib.optional; - mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; - major = "0.19"; - minor = "9"; - -in stdenv.mkDerivation rec { - name = "mpd-${major}.${minor}"; - src = fetchurl { - url = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.xz"; - sha256 = "0vzj365s4j0pw5w37lfhx3dmpkdp85driravsvx8rlrw0lii91a7"; - }; - - buildInputs = [ pkgconfig glib boost makeWrapper ] - ++ opt stdenv.isLinux systemd - ++ opt (stdenv.isLinux && alsaSupport) alsaLib - ++ opt flacSupport flac - ++ opt vorbisSupport libvorbis - # using libmad to decode mp3 files on darwin is causing a segfault -- there - # is probably a solution, but I'm disabling it for now - ++ opt (!stdenv.isDarwin && madSupport) libmad - ++ opt id3tagSupport libid3tag - ++ opt mikmodSupport libmikmod - ++ opt shoutSupport libshout - ++ opt sqliteSupport sqlite - ++ opt curlSupport curl - ++ opt bzip2Support bzip2 - ++ opt audiofileSupport audiofile - ++ opt ffmpegSupport ffmpeg - ++ opt fluidsynthSupport fluidsynth - ++ opt samplerateSupport libsamplerate - ++ opt mmsSupport libmms - ++ opt mpg123Support mpg123 - ++ opt aacSupport faad2 - ++ opt zipSupport zziplib - ++ opt pulseaudioSupport pulseaudio - ++ opt jackSupport jack2 - ++ opt gmeSupport game-music-emu - ++ opt icuSupport icu - ++ opt clientSupport mpd_clientlib - ++ opt opusSupport libopus; - - configureFlags = - [ (mkFlag (!stdenv.isDarwin && alsaSupport) "alsa") - (mkFlag flacSupport "flac") - (mkFlag vorbisSupport "vorbis") - (mkFlag vorbisSupport "vorbis-encoder") - (mkFlag (!stdenv.isDarwin && madSupport) "mad") - (mkFlag mikmodSupport "mikmod") - (mkFlag id3tagSupport "id3") - (mkFlag shoutSupport "shout") - (mkFlag sqliteSupport "sqlite") - (mkFlag curlSupport "curl") - (mkFlag audiofileSupport "audiofile") - (mkFlag bzip2Support "bzip2") - (mkFlag ffmpegSupport "ffmpeg") - (mkFlag fluidsynthSupport "fluidsynth") - (mkFlag zipSupport "zzip") - (mkFlag samplerateSupport "lsr") - (mkFlag mmsSupport "mms") - (mkFlag mpg123Support "mpg123") - (mkFlag aacSupport "aac") - (mkFlag pulseaudioSupport "pulse") - (mkFlag jackSupport "jack") - (mkFlag stdenv.isDarwin "osx") - (mkFlag icuSupport "icu") - (mkFlag gmeSupport "gme") - (mkFlag clientSupport "libmpdclient") - (mkFlag opusSupport "opus") - "--enable-debug" - ] - ++ opt stdenv.isLinux - "--with-systemdsystemunitdir=$(out)/etc/systemd/system"; - - postInstall = '' - wrapProgram $out/bin/mpd \ - --set JACK_PROMISCUOUS_SERVER 1 \ - --run "umask 0" - ''; - - NIX_LDFLAGS = '' - ${if shoutSupport then "-lshout" else ""} - ''; - - meta = with stdenv.lib; { - description = "A flexible, powerful daemon for playing music"; - homepage = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki; - license = licenses.gpl2; - maintainers = with maintainers; [ astsmtl fuuzetsu emery ]; - platforms = platforms.unix; - - longDescription = '' - Music Player Daemon (MPD) is a flexible, powerful daemon for playing - music. Through plugins and libraries it can play a variety of sound - files while being controlled by its network protocol. - ''; - }; -} -- cgit v1.2.3