geant4.data: refactor to use callPackage

This should enable some overriding capability.

+4 -7
+3 -3
pkgs/development/libraries/physics/geant4/datasets.nix
··· 1 - { lib, stdenv, fetchurl, geant_version }: 1 + { lib, stdenv, fetchurl, geant4 }: 2 2 3 3 let 4 4 mkDataset = { pname, version, sha256, envvar }: 5 5 stdenv.mkDerivation { 6 6 inherit pname version; 7 - inherit geant_version; 7 + geant_version = geant4.version; 8 8 9 9 src = fetchurl { 10 10 url = "https://cern.ch/geant4-data/datasets/${pname}.${version}.tar.gz"; ··· 15 15 dontBuild = true; 16 16 dontConfigure = true; 17 17 18 - datadir = "${placeholder "out"}/share/Geant4-${geant_version}/data/${pname}${version}"; 18 + datadir = "${placeholder "out"}/share/Geant4-${geant4.version}/data/${pname}${version}"; 19 19 installPhase = '' 20 20 mkdir -p $datadir 21 21 mv ./* $datadir
+1 -4
pkgs/development/libraries/physics/geant4/default.nix
··· 106 106 setupHook = ./geant4-hook.sh; 107 107 108 108 passthru = { 109 - data = import ./datasets.nix { 110 - inherit lib stdenv fetchurl; 111 - geant_version = version; 112 - }; 109 + data = callPackage ./datasets.nix {}; 113 110 114 111 tests = callPackage ./tests.nix {}; 115 112