diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-23 12:07:57 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-23 12:09:03 +0200 |
| commit | 6b27ceb006ace21f9157034ac743242a0147eeec (patch) | |
| tree | de8c80579090028b8a918796fd7a8eda3c4cecf0 /pkgs/development/libraries/ftgl | |
| parent | 14c038dd0390a9b24969f0138356b5c7520b9fdf (diff) | |
| parent | b3bcb59bd5fddc3c0f74bbe120de561bbea29878 (diff) | |
| download | nixlib-6b27ceb006ace21f9157034ac743242a0147eeec.tar nixlib-6b27ceb006ace21f9157034ac743242a0147eeec.tar.gz nixlib-6b27ceb006ace21f9157034ac743242a0147eeec.tar.bz2 nixlib-6b27ceb006ace21f9157034ac743242a0147eeec.tar.lz nixlib-6b27ceb006ace21f9157034ac743242a0147eeec.tar.xz nixlib-6b27ceb006ace21f9157034ac743242a0147eeec.tar.zst nixlib-6b27ceb006ace21f9157034ac743242a0147eeec.zip | |
Merge 'master' into staging and re-revert merge
... from staging to master, reverted temporarily in aa9a04883e34.
Diffstat (limited to 'pkgs/development/libraries/ftgl')
| -rw-r--r-- | pkgs/development/libraries/ftgl/2.1.2.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/ftgl/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/ftgl/2.1.2.nix b/pkgs/development/libraries/ftgl/2.1.2.nix index c83173450b19..0a4a6e6b9b00 100644 --- a/pkgs/development/libraries/ftgl/2.1.2.nix +++ b/pkgs/development/libraries/ftgl/2.1.2.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = { homepage = "http://sourceforge.net/apps/mediawiki/ftgl/"; - description = "font rendering library for OpenGL applications"; + description = "Font rendering library for OpenGL applications"; license = stdenv.lib.licenses.gpl3Plus; longDescription = '' diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix index ce750fc1696f..8fc69ec75685 100644 --- a/pkgs/development/libraries/ftgl/default.nix +++ b/pkgs/development/libraries/ftgl/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { homepage = "http://sourceforge.net/apps/mediawiki/ftgl/"; - description = "font rendering library for OpenGL applications"; + description = "Font rendering library for OpenGL applications"; license = stdenv.lib.licenses.gpl3Plus; longDescription = '' |