diff options
| author | Peter Simons <simons@cryp.to> | 2013-10-18 18:57:24 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2013-10-18 18:57:24 +0200 |
| commit | 6be8ad3392d87e277804ddec364377b5341430b7 (patch) | |
| tree | ce8a334fb3611b27336e9602bd248682931016b8 /pkgs/development/libraries/coin3d | |
| parent | ea6f711e8ec7208626a084edb81a78ee455a0b67 (diff) | |
| parent | 06d6c3ed5d061e95d1db92f7eff08d5c1a2181d8 (diff) | |
| download | nixpkgs-6be8ad3392d87e277804ddec364377b5341430b7.tar nixpkgs-6be8ad3392d87e277804ddec364377b5341430b7.tar.gz nixpkgs-6be8ad3392d87e277804ddec364377b5341430b7.tar.bz2 nixpkgs-6be8ad3392d87e277804ddec364377b5341430b7.tar.lz nixpkgs-6be8ad3392d87e277804ddec364377b5341430b7.tar.xz nixpkgs-6be8ad3392d87e277804ddec364377b5341430b7.tar.zst nixpkgs-6be8ad3392d87e277804ddec364377b5341430b7.zip | |
Merge branch 'origin/master' into stdenv-updates.
There was a minor conflict in 'stumpwm'. The package needs texinfo version 4.x. At least is used to, I'm not sure whether it still does.
Diffstat (limited to 'pkgs/development/libraries/coin3d')
| -rw-r--r-- | pkgs/development/libraries/coin3d/default.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/libraries/coin3d/default.nix b/pkgs/development/libraries/coin3d/default.nix index 5eb93621f41..f866b2299c1 100644 --- a/pkgs/development/libraries/coin3d/default.nix +++ b/pkgs/development/libraries/coin3d/default.nix @@ -23,8 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.coin3d.org/; license = "GPLv2+"; - description = "High-level, retained-mode toolkit for effective 3D graphics development."; - + description = "High-level, retained-mode toolkit for effective 3D graphics development"; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; }; |