1 files changed, 11 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix b/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix
index 4ec117777857..007e4ad0c32f 100644
--- a/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix
@@ -30,18 +30,18 @@
 , libXpm
 
 # For enableQT, enableXM, enableOpenGLX11, enableRaytracerX11.
-, libGLU_combined
+, libGLU, libGL
 , xlibsWrapper
 , libXmu
 }:
 
-stdenv.mkDerivation {
-  version = "10.4.1";
+stdenv.mkDerivation rec {
+  version = "10.5.1";
   pname = "geant4";
 
   src = fetchurl{
-    url = "http://cern.ch/geant4-data/releases/geant4.10.04.p01.tar.gz";
-    sha256 = "a3eb13e4f1217737b842d3869dc5b1fb978f761113e74bd4eaf6017307d234dd";
+    url = "http://cern.ch/geant4-data/releases/geant4.10.05.p01.tar.gz";
+    sha256 = "f4a292220500fad17e0167ce3153e96e3410ecbe96284e572dc707f63523bdff";
   };
 
   cmakeFlags = [
@@ -64,7 +64,7 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
   nativeBuildInputs =  [ cmake ];
-  buildInputs = [ clhep expat zlib libGLU_combined xlibsWrapper libXmu ]
+  buildInputs = [ clhep expat zlib libGLU libGL xlibsWrapper libXmu ]
     ++ stdenv.lib.optionals enableGDML [ xercesc ]
     ++ stdenv.lib.optionals enableXM [ motif ]
     ++ stdenv.lib.optionals enableQT [ qtbase ]
@@ -78,7 +78,10 @@ stdenv.mkDerivation {
   setupHook = ./geant4-hook.sh;
 
   passthru = {
-    data = import ./datasets.nix { inherit stdenv fetchurl; };
+    data = import ./datasets.nix {
+          inherit stdenv fetchurl;
+          geant_version = version;
+      };
   };
 
   # Set the myriad of envars required by Geant4 if we use a nix-shell.
@@ -95,7 +98,7 @@ stdenv.mkDerivation {
     '';
     homepage = http://www.geant4.org;
     license = licenses.g4sl;
-    maintainers = with maintainers; [ tmplt ];
+    maintainers = with maintainers; [ tmplt omnipotententity ];
     platforms = platforms.linux;
   };
 }