diff options
| -rw-r--r-- | pkgs/misc/jackaudio/default.nix | 29 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 18 insertions, 17 deletions
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 578786aac805..7c4450a8a2bd 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -3,11 +3,13 @@ args: args.mkDerivationByConfiguration { flagConfig = { - mandatory = { buildInputs = [ ];}; + mandatory = { buildInputs = [ "pkgconfig" ];}; + + # FIXME: tidy up # static[=PKGS] = { cfgOption = "--enable-static[=PKGS]"; }; #build static libraries [default=no] # shared[=PKGS] = { cfgOption = "--enable-shared[=PKGS]"; }; #build shared libraries [default=yes] - posix_shm = { cfgOption = "--enable-posix-shm"; }; #use POSIX shm API + posix_shm = { cfgOption = "--enable-posix-shm"; }; #use POSIX shm API # altivec seems to be for mac only ? # altivec = { cfgOption = "--enable-altivec"; }; #enable Altivec support (default=auto) @@ -16,15 +18,15 @@ args.mkDerivationByConfiguration { # optimization_by_cpu = { cfgOption = "--enable-optimization-by-cpu"; }; [>use processor capabilities to determine optimization flags # I think the default is ok - # mmx = { cfgOption = "--enable-mmx"; }; #enable MMX support (default=auto) - sse = { cfgOption = "--enable-sse"; }; #enable SSE support (default=auto) - dynsimd = { cfgOption = "--enable-dynsimd"; }; #enable dynamic SIMD selection (default=no) - optimize = { cfgOption = "--enable-optimize"; }; #ask the compiler for its best optimizations - resize = { cfgOption = "--enable-resize"; }; #enable buffer resizing feature - ensure_mlock = { cfgOption = "--enable-ensure-mlock"; }; #fail if unable to lock memory - debug = { cfgOption = "--enable-debug"; }; #enable debugging messages in jackd and libjack - timestamps = { cfgOption = "--enable-timestamps"; }; #allow clients to use the JACK timestamp API - preemption_check = { cfgOption = "--enable-preemption-check"; }; # + # mmx = { cfgOption = "--enable-mmx"; }; #enable MMX support (default=auto) + #sse = { cfgOption = "--enable-sse"; }; #enable SSE support (default=auto) + #dynsimd = { cfgOption = "--enable-dynsimd"; }; #enable dynamic SIMD selection (default=no) + #optimize = { cfgOption = "--enable-optimize"; }; #ask the compiler for its best optimizations + #resize = { cfgOption = "--enable-resize"; }; #enable buffer resizing feature + #ensure_mlock = { cfgOption = "--enable-ensure-mlock"; }; #fail if unable to lock memory + #debug = { cfgOption = "--enable-debug"; }; #enable debugging messages in jackd and libjack + timestamps = { cfgOption = "--enable-timestamps"; }; # allow clients to use the JACK timestamp API + #preemption_check = { cfgOption = "--enable-preemption-check"; }; # capabilities = { cfgOption = "--enable-capabilities"; }; #use libcap to gain realtime scheduling priviledges no_oldtrans = { cfgOption = "--disable-oldtrans"; }; #remove old transport interfaces @@ -33,6 +35,7 @@ args.mkDerivationByConfiguration { no_coreaudio = { cfgOption = "--disable-coreaudio"; }; #ignore CoreAudio driver no_oss = { cfgOption = "--disable-oss"; }; #ignore OSS driver no_freebob = { cfgOption = "--disable-freebob"; }; #ignore FreeBob driver + alsa = { cfgOption = "--enable-alsa"; buildInputs="alsaLib"; }; #enable ALSA driver no_alsa = { cfgOption = "--disable-alsa"; }; #ignore ALSA driver }; @@ -41,8 +44,8 @@ args.mkDerivationByConfiguration { name = "jack-0.103.0"; src = args.fetchurl { - url = "http://prdownloads.sourceforge.net/jackit/jack-audio-connection-kit-0.103.0.tar.gz"; - sha256 = "0pr3vxsfignvc9kls52zvyxhl7mwan0nhnlvcz3s3r3ydmlzvnd5"; + url = "mirror://sourceforge/jackit/jack-audio-connection-kit-0.109.2.tar.gz"; + sha256 = "1m5z8dzalqspsa63pkcgyns0cvh0kqwhb9g1ivcwvnz0bc7ag9r7"; }; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 020d62bf0772..8cbfd65f834e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7249,13 +7249,11 @@ let pkgs = rec { */ # using the new configuration style proposal which is unstable - /* jackaudio = import ../misc/jackaudio { inherit mkDerivationByConfiguration - ncurses lib stdenv fetchurl; - flags = [ "posix_shm" "timestamps"]; + ncurses lib stdenv fetchurl alsaLib pkgconfig; + flags = [ "posix_shm" "timestamps" "alsa"]; }; - */ keynav = import ../tools/X11/keynav { inherit stdenv fetchurl; |