about summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2012-10-10 19:26:31 +0200
committerPeter Simons <simons@cryp.to>2012-10-10 19:26:31 +0200
commit0bb86f86b14359f90b0de7332ad05f00ab6fd08c (patch)
treedebf2446b7bcb8dd6aee20d66c94de1ca3234252 /pkgs/applications
parent6ff829f19df8b414960081a656e055bb9952c86f (diff)
parent6ef73f57c308cb11a98f2d56bee46e491a4e87a4 (diff)
downloadnixlib-0bb86f86b14359f90b0de7332ad05f00ab6fd08c.tar
nixlib-0bb86f86b14359f90b0de7332ad05f00ab6fd08c.tar.gz
nixlib-0bb86f86b14359f90b0de7332ad05f00ab6fd08c.tar.bz2
nixlib-0bb86f86b14359f90b0de7332ad05f00ab6fd08c.tar.lz
nixlib-0bb86f86b14359f90b0de7332ad05f00ab6fd08c.tar.xz
nixlib-0bb86f86b14359f90b0de7332ad05f00ab6fd08c.tar.zst
nixlib-0bb86f86b14359f90b0de7332ad05f00ab6fd08c.zip
Merge branch 'master' into x-updates.
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/science/astronomy/gravit/default.nix22
1 files changed, 7 insertions, 15 deletions
diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix
index 388e65c9f753..820b4fb2979a 100644
--- a/pkgs/applications/science/astronomy/gravit/default.nix
+++ b/pkgs/applications/science/astronomy/gravit/default.nix
@@ -1,24 +1,16 @@
-{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, mesa, lua5_0 }:
+{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, mesa, lua5_1, automake, autoconf }:
 
-let
-  name = "gravit-0.4.2";
-in
-stdenv.mkDerivation {
-  inherit name;
+stdenv.mkDerivation rec {
+  name = "gravit-0.5.0";
 
   src = fetchurl {
-    url = "http://gravit.slowchop.com/dist/${name}.tar.gz";
-    sha256 = "f37f3ac256a4acbf575f709addaae8cb01eda4f85537affa28c45f2df6fddb07";
+    url = "http://gravit.slowchop.com/media/downloads/${name}.tgz";
+    sha256 = "0lyw0skrkb04s16vgz7ggswjrdxk1h23v5s85s09gjxzjp1xd3xp";
   };
 
-  buildInputs = [mesa SDL SDL_ttf SDL_image lua5_0];
+  buildInputs = [mesa SDL SDL_ttf SDL_image lua5_1 automake autoconf];
 
-  configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3";
-
-  postInstall = ''
-    mv $out/etc/gravit $out/share/gravit/sample-config
-    rmdir $out/etc
-  '';
+  preConfigure = "sh autogen.sh";
 
   meta = {
     homepage = "http://gravit.slowchop.com";