summary refs log tree commit diff
path: root/pkgs/development/libraries/freeglut
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2015-08-17 18:59:53 +0200
committerBjørn Forsman <bjorn.forsman@gmail.com>2015-08-18 18:45:14 +0200
commit38880d19cb1b1378851c0dc3a496597c67654843 (patch)
tree67019cb05018bd65c508432b8d23e62324c07d35 /pkgs/development/libraries/freeglut
parente1f7e7128b12feafd517410206d0f71547ec1aa4 (diff)
downloadnixpkgs-38880d19cb1b1378851c0dc3a496597c67654843.tar
nixpkgs-38880d19cb1b1378851c0dc3a496597c67654843.tar.gz
nixpkgs-38880d19cb1b1378851c0dc3a496597c67654843.tar.bz2
nixpkgs-38880d19cb1b1378851c0dc3a496597c67654843.tar.lz
nixpkgs-38880d19cb1b1378851c0dc3a496597c67654843.tar.xz
nixpkgs-38880d19cb1b1378851c0dc3a496597c67654843.tar.zst
nixpkgs-38880d19cb1b1378851c0dc3a496597c67654843.zip
freeglut: 2.8.1 -> 3.0.0
* Upstream switched to cmake => remove autoreconfHook
* Makefile.am is gone => remove darwin specific patch (untested)

The new version has a pkg-config file. Yay!

Tested locally with `nox-review wip`; no regressions found.
Diffstat (limited to 'pkgs/development/libraries/freeglut')
-rw-r--r--pkgs/development/libraries/freeglut/default.nix20
1 files changed, 4 insertions, 16 deletions
diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix
index 74cc5c6796e..6159ce7c9e0 100644
--- a/pkgs/development/libraries/freeglut/default.nix
+++ b/pkgs/development/libraries/freeglut/default.nix
@@ -1,27 +1,15 @@
-{ stdenv, lib, fetchurl, libXi, libXrandr, libXxf86vm, mesa, x11, autoreconfHook }:
+{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, mesa, x11, cmake }:
 
-let version = "2.8.1";
+let version = "3.0.0";
 in stdenv.mkDerivation {
   name = "freeglut-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/freeglut/freeglut-${version}.tar.gz";
-    sha256 = "16lrxxxd9ps9l69y3zsw6iy0drwjsp6m26d1937xj71alqk6dr6x";
+    sha256 = "18knkyczzwbmyg8hr4zh8a1i5ga01np2jzd1rwmsh7mh2n2vwhra";
   };
 
-  buildInputs = [
-    libXi libXrandr libXxf86vm mesa x11
-  ] ++ lib.optionals stdenv.isDarwin [
-    autoreconfHook
-  ];
-
-  postPatch = lib.optionalString stdenv.isDarwin ''
-    substituteInPlace Makefile.am --replace \
-      "SUBDIRS = src include progs doc" \
-      "SUBDIRS = src include doc"
-  '';
-
-  configureFlags = [ "--enable-warnings" ];
+  buildInputs = [ libXi libXrandr libXxf86vm mesa x11 cmake ];
 
   meta = with stdenv.lib; {
     description = "Create and manage windows containing OpenGL contexts";