summary refs log tree commit diff
path: root/pkgs/development/libraries/libchamplain/default.nix
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2014-08-23 16:04:53 +0200
committerVladimír Čunát <vcunat@gmail.com>2014-08-23 16:04:53 +0200
commit96cec2a7bdf2482ae58fe04cce5e87a1eec644f9 (patch)
treeea48b901c9ba0ac2b4a249ae94bd966c4a025001 /pkgs/development/libraries/libchamplain/default.nix
parentdb83d9a35b09a7cc548d9b8b2ad63c1f8ca8ba28 (diff)
parent084626deecaffcaa017af07eaab00682eff5d6f3 (diff)
downloadnixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar
nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar.gz
nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar.bz2
nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar.lz
nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar.xz
nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar.zst
nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.zip
Merge 'staging' into multiple-outputs
Conflicts:
	pkgs/applications/audio/flac/default.nix
	pkgs/build-support/gcc-wrapper/builder.sh
	pkgs/development/libraries/apr-util/default.nix
	pkgs/development/libraries/apr/default.nix
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/builder.sh
	pkgs/development/libraries/glibc/2.17/locales.nix
	pkgs/development/libraries/libjpeg/default.nix
	pkgs/development/libraries/libogg/default.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/libvorbis/default.nix
	pkgs/development/libraries/mesa/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/development/web/nodejs/default.nix
	pkgs/os-specific/linux/pam/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/stdenv/generic/setup.sh
	pkgs/stdenv/linux/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-small.nix
Diffstat (limited to 'pkgs/development/libraries/libchamplain/default.nix')
-rw-r--r--pkgs/development/libraries/libchamplain/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix
index 263b34701eed..51b7f7e181d0 100644
--- a/pkgs/development/libraries/libchamplain/default.nix
+++ b/pkgs/development/libraries/libchamplain/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://projects.gnome.org/libchamplain/;
-    license = "LGPLv2+";
+    license = stdenv.lib.licenses.lgpl2Plus;
 
     description = "libchamplain, a C library providing a ClutterActor to display maps";