From 539efba194097cb28ab08e18eb20d9ebfb1243e5 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Wed, 28 Feb 2018 15:01:24 +0200 Subject: [PATCH] glm: remove 0.9.5.4, as it not used anymore. was used only in libreoffice-still, where was commented out 2 years ago. I feel it time for farewell 0.9.5.4. --- pkgs/development/libraries/glm/0954.nix | 36 ------------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 38 deletions(-) delete mode 100644 pkgs/development/libraries/glm/0954.nix diff --git a/pkgs/development/libraries/glm/0954.nix b/pkgs/development/libraries/glm/0954.nix deleted file mode 100644 index 4eb3497b039..00000000000 --- a/pkgs/development/libraries/glm/0954.nix +++ /dev/null @@ -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 ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0117a20b056..6ab3c3c692b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 = [