diff options
author | David Guibert <david.guibert@gmail.com> | 2012-10-26 18:24:48 +0200 |
---|---|---|
committer | David Guibert <david.guibert@gmail.com> | 2012-10-26 18:28:54 +0200 |
commit | f16f48be885ce57b5a119aeebafc3a7606656b32 (patch) | |
tree | 55a78622cab7646d07f987a01620138c0dce0f12 | |
parent | 0efbc7d3bfe6d9eb0fcdecc6964c10c093352e0e (diff) | |
download | nixpkgs-f16f48be885ce57b5a119aeebafc3a7606656b32.tar nixpkgs-f16f48be885ce57b5a119aeebafc3a7606656b32.tar.gz nixpkgs-f16f48be885ce57b5a119aeebafc3a7606656b32.tar.bz2 nixpkgs-f16f48be885ce57b5a119aeebafc3a7606656b32.tar.lz nixpkgs-f16f48be885ce57b5a119aeebafc3a7606656b32.tar.xz nixpkgs-f16f48be885ce57b5a119aeebafc3a7606656b32.tar.zst nixpkgs-f16f48be885ce57b5a119aeebafc3a7606656b32.zip |
update pulseaudio to 2.1
Systemd support has also been added because pulseaudio needs it to be useable with the systemd branch of nixos.
-rw-r--r-- | pkgs/servers/pulseaudio/default.nix | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 21112250597..e315f788904 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -4,16 +4,17 @@ , jackaudioSupport ? false, jackaudio ? null , x11Support ? false, xlibs , json_c +, useSystemd ? false, systemd ? null }: assert jackaudioSupport -> jackaudio != null; stdenv.mkDerivation rec { - name = "pulseaudio-1.1"; + name = "pulseaudio-2.1"; src = fetchurl { - url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-1.1.tar.xz"; - sha256 = "1vpm0681zj2jvhbabvnmrmfxr3172k4x58kjb39y5g3fdw9k3rbg"; + url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-2.1.tar.xz"; + sha256 = "0zyal2mix7lzhxmr3pxlmss5kjca061iapvrh20bkgvsyixk8szg"; }; # Since `libpulse*.la' contain `-lgdbm', it must be propagated. @@ -26,13 +27,10 @@ stdenv.mkDerivation rec { #gtk gconf ] ++ stdenv.lib.optional jackaudioSupport jackaudio - ++ stdenv.lib.optionals x11Support [ xlibs.xlibs xlibs.libXtst xlibs.libXi ]; + ++ stdenv.lib.optionals x11Support [ xlibs.xlibs xlibs.libXtst xlibs.libXi ] + ++ stdenv.lib.optional useSystemd systemd; preConfigure = '' - # Change the `padsp' script so that it contains the full path to - # `libpulsedsp.so'. - sed -i "src/utils/padsp" \ - -e "s|libpulsedsp\.so|$out/lib/libpulsedsp.so|g" # Move the udev rules under $(prefix). sed -i "src/Makefile.in" \ |