Commit graph

6 commits

Author SHA1 Message Date
Vladimír Čunát
ec3965d8d0 Revert Merge x-updates into master due to mesa bloat
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
2013-05-09 14:03:35 +02:00
Vladimír Čunát
efd432e862 intltool: add propagated gettext 2013-01-31 17:41:07 +01:00
Florian Friesdorf
fc57b8940b intltool: fix license attribute name 2012-11-26 16:11:32 +01:00
Michael Raskin
7333c01dba Update Compiz 2012-11-25 23:58:04 +04:00
Eelco Dolstra
c54b75c959 * Get rid of the `(import (__toPath ((toString
./JustNothing/.. )+"/"+args.version+".nix")))' hack, you can also just
  write `import (./path/to/pkg + "/${version}.nix)'.

svn path=/nixpkgs/trunk/; revision=9792
2007-11-26 13:24:56 +00:00
Michael Raskin
7b1c9a7a82 Added Compiz Fusion (main plugins). Also some dependencies, and made wmii build under setup-new-2.sh also.
svn path=/nixpkgs/trunk/; revision=9577
2007-11-05 08:32:20 +00:00