about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2013-02-09 18:38:26 +0100
committerVladimír Čunát <vcunat@gmail.com>2013-02-09 18:38:26 +0100
commit9abff7a85ec47613cd701c4b319fc6fe8fed4fae (patch)
tree5fac78f085359e8799e65ae62a56716beb3c8d22 /pkgs/top-level
parent5e28bf0bdefc502ed041bf36bcaeb8681804815e (diff)
downloadnixlib-9abff7a85ec47613cd701c4b319fc6fe8fed4fae.tar
nixlib-9abff7a85ec47613cd701c4b319fc6fe8fed4fae.tar.gz
nixlib-9abff7a85ec47613cd701c4b319fc6fe8fed4fae.tar.bz2
nixlib-9abff7a85ec47613cd701c4b319fc6fe8fed4fae.tar.lz
nixlib-9abff7a85ec47613cd701c4b319fc6fe8fed4fae.tar.xz
nixlib-9abff7a85ec47613cd701c4b319fc6fe8fed4fae.tar.zst
nixlib-9abff7a85ec47613cd701c4b319fc6fe8fed4fae.zip
Major Xfce refactoring, also adding versions 4.10.*
Please, comment on #296.
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix11
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 33503f65b3dc..ca4644153068 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4488,6 +4488,8 @@ let
 
   libungif = callPackage ../development/libraries/giflib/libungif.nix { };
 
+  libunique = callPackage ../development/libraries/libunique/default.nix { };
+
   libusb = callPackage ../development/libraries/libusb { };
 
   libusb1 = callPackage ../development/libraries/libusb1 { };
@@ -8622,12 +8624,9 @@ let
 
   oxygen_gtk = callPackage ../misc/themes/gtk2/oxygen-gtk { };
 
-  xfce = xfce48;
-
-  xfce48 = recurseIntoAttrs
-    (let callPackage = newScope pkgs.xfce48; in
-     import ../desktops/xfce-4.8 { inherit callPackage pkgs; });
-
+  xfce = xfce4_10;
+  xfce4_08 = recurseIntoAttrs (import ../desktops/xfce/4_08.nix { inherit pkgs newScope; });
+  xfce4_10 = recurseIntoAttrs (import ../desktops/xfce/4_10.nix { inherit pkgs newScope; });
 
   ### SCIENCE