Commit Graph

10 Commits

Author SHA1 Message Date
Carles Pagès
3cee0c8524 jsoncpp: the shared lib was not being built
Since the last version update only the static lib was built, and even that was
removed in the last commit. Fix shared ones, which is what we want. Also, add
myself to maintainers.
2015-07-13 14:31:48 +02:00
Eelco Dolstra
553abf71ba Merge remote-tracking branch 'origin/staging' into gcc-4.9
Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/libraries/wayland/default.nix
	pkgs/development/tools/build-managers/cmake/default.nix
	pkgs/top-level/all-packages.nix
2015-06-01 20:08:43 +02:00
Tobias Geerinckx-Rice
158e1cfdd0 Don't use "with licenses;" for single licences
And don't use square brackets on such lines.
2015-05-28 19:20:29 +02:00
Eelco Dolstra
26f17ee091 cmake: Get rid of circular dependency
Also, don't install static libraries in jsoncpp.
2015-05-13 18:17:26 +02:00
Shea Levy
7e1286bf01 jsoncpp: don't rely on coreutils cp 2015-05-12 16:28:07 -04:00
William A. Kennington III
3550d117cc jsoncpp: 1.6.0 -> 1.6.2 2015-05-01 22:26:55 -07:00
Thomas Tuegel
143aa5aa17 remove jsoncpp-0.6.0-rc2 2015-03-22 17:05:12 -05:00
Thomas Tuegel
a910301e18 make cmake-3.2 the default version 2015-03-22 17:00:46 -05:00
Thomas Tuegel
19a4fc2b46 add jsoncpp-1.6.0
dependency of cmake-3.2
2015-03-21 12:32:12 -05:00
Carles Pagès
b66e1808ef Add JsonCpp v0.6.0
Close #1112.
2013-10-24 11:12:31 +03:00