diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-11-10 23:27:05 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-11-10 23:27:05 +0000 |
| commit | 1abb8f9a260e117e40eba4b06b5fd0237a3f2d26 (patch) | |
| tree | 2c0ec2b4bc4e32d9511577423a787648b9688671 /pkgs/servers/pulseaudio/default.nix | |
| parent | c8da189d391c59e830e77b98d922913609b7bcec (diff) | |
| download | nixlib-1abb8f9a260e117e40eba4b06b5fd0237a3f2d26.tar nixlib-1abb8f9a260e117e40eba4b06b5fd0237a3f2d26.tar.gz nixlib-1abb8f9a260e117e40eba4b06b5fd0237a3f2d26.tar.bz2 nixlib-1abb8f9a260e117e40eba4b06b5fd0237a3f2d26.tar.lz nixlib-1abb8f9a260e117e40eba4b06b5fd0237a3f2d26.tar.xz nixlib-1abb8f9a260e117e40eba4b06b5fd0237a3f2d26.tar.zst nixlib-1abb8f9a260e117e40eba4b06b5fd0237a3f2d26.zip | |
* Fix PulseAudio's config files installation paths.
svn path=/nixpkgs/trunk/; revision=30383
Diffstat (limited to 'pkgs/servers/pulseaudio/default.nix')
| -rw-r--r-- | pkgs/servers/pulseaudio/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 881d9811a408..13d0af8987ce 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { #gtk gconf ] ++ stdenv.lib.optional jackaudioSupport jackaudio - ++ stdenv.lib.optional x11Support xlibs.xlibs; + ++ stdenv.lib.optionals x11Support [ xlibs.xlibs xlibs.libXtst xlibs.libXi ]; preConfigure = '' # Change the `padsp' script so that it contains the full path to @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ${if jackaudioSupport then "--enable-jack" else ""} ''; - installFlags = "pulseconfdir=$(out)/etc dbuspolicydir=$out/etc/dbus-1/system.d xdgautostartdir=$out/etc/xdg/autostart"; + installFlags = "sysconfdir=$(out)/etc pulseconfdir=$(out)/etc/pulse"; enableParallelBuilding = true; |