alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #36118 from avnik/fix/glm

Browse source 
glm: removed anciet version of glm, it not used anymore
This commit is contained in:
Jörg Thalheim 2018-02-28 13:42:32 +00:00 committed by GitHub
parent 09f18d3baf 539efba194
commit edf077d392
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
pkgs/development/libraries/glm/0954.nix
View file

@ -1,36 +0,0 @@
{ stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
name = "glm-0.9.5.4";
src = fetchurl {
url = "mirror://sourceforge/project/ogl-math/${name}/${name}.zip";
sha256 = "0v14xssysy3q1h2mga6rqlz722mwbis4rrx76zmvhjqh17qh4l62";
};
buildInputs = [ unzip ];
outputs = [ "out" "doc" ];
installPhase = ''
mkdir -p "$out/include"
cp -r glm "$out/include"
mkdir -p "$doc/share/doc/glm"
cp -r doc/* "$doc/share/doc/glm"
'';
meta = with stdenv.lib; {
description = "OpenGL Mathematics library for C++";
longDescription = ''
OpenGL Mathematics (GLM) is a header only C++ mathematics library for
graphics software based on the OpenGL Shading Language (GLSL)
specification and released under the MIT license.
'';
homepage = http://glm.g-truc.net/;
license = licenses.mit;
branch = "0.9.5.4";
platforms = platforms.unix;
maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
}

2
pkgs/top-level/all-packages.nix
View file

@ -8899,7 +8899,6 @@ with pkgs;
};
glm = callPackage ../development/libraries/glm { };
glm_0954 = callPackage ../development/libraries/glm/0954.nix { };
globalplatform = callPackage ../development/libraries/globalplatform { };
gppcscconnectionplugin =
@ -16269,7 +16268,6 @@ with pkgs;
inherit (gnome2) GConf ORBit2 gnome_vfs;
inherit (gnome3) defaultIconTheme;
zip = zip.override { enableNLS = false; };
#glm = glm_0954;
bluez5 = bluez5_28;
fontsConf = makeFontsConf {
fontDirectories = [