about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2017-12-29 01:06:38 +0100
committerRobin Gloster <mail@glob.in>2017-12-29 01:11:39 +0100
commit02545a64a959dfd2947b7e6c7960fb8f6506712b (patch)
tree5c3a847a3cf88f4283ad5486d1f31672dc6c8e73
parent87e71f22c850a064a0881771cb4a29508a6950e5 (diff)
downloadnixlib-02545a64a959dfd2947b7e6c7960fb8f6506712b.tar
nixlib-02545a64a959dfd2947b7e6c7960fb8f6506712b.tar.gz
nixlib-02545a64a959dfd2947b7e6c7960fb8f6506712b.tar.bz2
nixlib-02545a64a959dfd2947b7e6c7960fb8f6506712b.tar.lz
nixlib-02545a64a959dfd2947b7e6c7960fb8f6506712b.tar.xz
nixlib-02545a64a959dfd2947b7e6c7960fb8f6506712b.tar.zst
nixlib-02545a64a959dfd2947b7e6c7960fb8f6506712b.zip
glm: 0.9.8.4 -> 0.9.8.5, clean up build
-rw-r--r--pkgs/development/libraries/glm/default.nix30
1 files changed, 12 insertions, 18 deletions
diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix
index 1f7d8595c218..904727ceae63 100644
--- a/pkgs/development/libraries/glm/default.nix
+++ b/pkgs/development/libraries/glm/default.nix
@@ -1,34 +1,28 @@
-{ stdenv, fetchurl, unzip, cmake }:
+{ stdenv, fetchzip, cmake }:
 
 stdenv.mkDerivation rec {
-  version = "0.9.8.4";
+  version = "0.9.8.5";
   name = "glm-${version}";
 
-  src = fetchurl {
+  src = fetchzip {
     url = "https://github.com/g-truc/glm/releases/download/${version}/${name}.zip";
-    sha256 = "1c9cflvx0b16qxh3izk6siqldp9q8qlrznk14br3jdyhnr2gbdx9";
+    sha256 = "0dkfj4hin3am9fxgcvwr5gj0h9y52x7wa03lfwb3q0bvaj1rsly2";
   };
 
-  buildInputs = [ unzip cmake ];
+  nativeBuildInputs = [ cmake ];
 
   outputs = [ "out" "doc" ];
 
-  phases = [ "unpackPhase" "buildPhase" "installPhase" ];
+  cmakeConfigureFlags = [ "-DGLM_INSTALL_ENABLE=off" ];
 
-  buildPhase = ''
-    set -x
-    cmake CMakeLists.txt -DCMAKE_INSTALL_PREFIX:PATH=$out
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace '"''${CMAKE_CURRENT_BINARY_DIR}/''${GLM_INSTALL_CONFIGDIR}' '"''${GLM_INSTALL_CONFIGDIR}'
   '';
 
-  installPhase = ''
-    mkdir -p $out/lib/pkgconfig
-    cp glm.pc $out/lib/pkgconfig
-
-    mkdir -p "$out/include"
-    cp -r glm "$out/include"
-
-    mkdir -p "$doc/share/doc/glm"
-    cp -r doc/* "$doc/share/doc/glm"
+  postInstall = ''
+    mkdir -p $doc/share/doc/glm
+    cp -rv $NIX_BUILD_TOP/$sourceRoot/doc/* $doc/share/doc/glm
   '';
 
   meta = with stdenv.lib; {