about summary refs log tree commit diff
path: root/pkgs/desktops/xfce-4/default.nix
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-10-23 14:52:21 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-10-23 14:52:21 +0000
commit6dc839d3445e66b259361f08838a8c05b1912e68 (patch)
tree5ef88f8fe4cb6f75cf0a1c1e821945c7186491c7 /pkgs/desktops/xfce-4/default.nix
parent4309788df022c89765cd7f6b178f4ce7a08db600 (diff)
parent327a2eae30b48277bd453842d03a144f618822b2 (diff)
downloadnixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar
nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.gz
nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.bz2
nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.lz
nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.xz
nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.zst
nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.zip
Merging from trunk. I resolved some conflicts; I hope that well.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
Diffstat (limited to 'pkgs/desktops/xfce-4/default.nix')
-rw-r--r--pkgs/desktops/xfce-4/default.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/desktops/xfce-4/default.nix b/pkgs/desktops/xfce-4/default.nix
index 3d4abf9b3582..6f2eaf1b4bfe 100644
--- a/pkgs/desktops/xfce-4/default.nix
+++ b/pkgs/desktops/xfce-4/default.nix
@@ -57,6 +57,8 @@ rec {
 
   xfce4_power_manager = callPackage ./applications/xfce4-power-manager.nix { };
 
+  xfce4mixer = callPackage ./applications/xfce4-mixer.nix { };
+
   #### ART
 
   xfce4icontheme = callPackage ./art/xfce4-icon-theme.nix { };