Peter Simons
2d326e5032
Merge remote-tracking branch 'origin/master' into staging.
...
Conflicts:
pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Mateusz Kowalczyk
7a45996233
Turn some license strings into lib.licenses values
2014-07-28 11:31:14 +02:00
Eelco Dolstra
ff97b7dbe6
Merge remote-tracking branch 'origin/master' into staging
2014-07-14 17:04:55 +02:00
Luca Bruno
6aa0a5d9d3
libvte: fix .la file to include the libpath for ncurses
...
Without this patch, the .la file only added -lncurses without
specifying the nix store path, forcing the propagation
of ncurses as build input.
Also enable parallel building and add myself to the maintainers.
2014-07-10 23:13:54 +02:00
Luca Bruno
da9b510996
Move at_spi2_core and at_spi2_atk outside of the gnome3 attrset
2014-07-10 11:39:16 +02:00
John Wiegley
4304487003
libcroco: weaken platform requirement for building on darwin
2014-06-25 11:14:35 -07:00
Bjørn Forsman
76672dd9e3
accountsservice: be consistent in naming (always two 's')
...
The package is (correctly) named 'accountsservice' (with two 's'), but
the attribute and expression path lacked one 's'. Fix it.
2014-06-22 21:32:16 +02:00
Luca Bruno
d05fa3ccfe
Branch gnome 3.12
2014-05-20 13:41:33 +02:00
