From 6489c1e2a643c4cf7115eacabd31c0cfc898b1de Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 30 Jun 2022 11:26:16 -0400
Subject: [PATCH] geant4.data: refactor to use callPackage

This should enable some overriding capability.
---
 pkgs/development/libraries/physics/geant4/datasets.nix | 6 +++---
 pkgs/development/libraries/physics/geant4/default.nix  | 5 +----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/physics/geant4/datasets.nix b/pkgs/development/libraries/physics/geant4/datasets.nix
index 18809654c467..b1df2875fab7 100644
--- a/pkgs/development/libraries/physics/geant4/datasets.nix
+++ b/pkgs/development/libraries/physics/geant4/datasets.nix
@@ -1,10 +1,10 @@
-{ lib, stdenv, fetchurl, geant_version }:
+{ lib, stdenv, fetchurl, geant4 }:
 
 let
   mkDataset = { pname, version, sha256, envvar }:
     stdenv.mkDerivation {
       inherit pname version;
-      inherit geant_version;
+      geant_version = geant4.version;
 
       src = fetchurl {
         url = "https://cern.ch/geant4-data/datasets/${pname}.${version}.tar.gz";
@@ -15,7 +15,7 @@ let
       dontBuild = true;
       dontConfigure = true;
 
-      datadir = "${placeholder "out"}/share/Geant4-${geant_version}/data/${pname}${version}";
+      datadir = "${placeholder "out"}/share/Geant4-${geant4.version}/data/${pname}${version}";
       installPhase = ''
         mkdir -p $datadir
         mv ./* $datadir
diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix
index 8f724e21a0c5..3a23d25d8751 100644
--- a/pkgs/development/libraries/physics/geant4/default.nix
+++ b/pkgs/development/libraries/physics/geant4/default.nix
@@ -106,10 +106,7 @@ stdenv.mkDerivation rec {
   setupHook = ./geant4-hook.sh;
 
   passthru = {
-    data = import ./datasets.nix {
-          inherit lib stdenv fetchurl;
-          geant_version = version;
-      };
+    data = callPackage ./datasets.nix {};
 
     tests = callPackage ./tests.nix {};