dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions2 Packages Projects Releases Wiki Activity

geant4.data: refactor to use callPackage

Browse Source 
This should enable some overriding capability.
This commit is contained in:
Dmitry Kalinkin 2022-06-30 11:26:16 -04:00
parent 714b6a7665
commit 6489c1e2a6
No known key found for this signature in database
GPG Key ID: 5157B3EC8B2CA333
2 changed files with 4 additions and 7 deletions
pkgs/development/libraries/physics/geant4
datasets.nixdefault.nix

6
pkgs/development/libraries/physics/geant4/datasets.nix
View File

@ -1,10 +1,10 @@
{ lib, stdenv, fetchurl, geant_version }: { lib, stdenv, fetchurl, geant4 }:
let let
mkDataset = { pname, version, sha256, envvar }: mkDataset = { pname, version, sha256, envvar }:
stdenv.mkDerivation { stdenv.mkDerivation {
inherit pname version; inherit pname version;
inherit geant_version; geant_version = geant4.version;
src = fetchurl { src = fetchurl {
url = "https://cern.ch/geant4-data/datasets/${pname}.${version}.tar.gz"; url = "https://cern.ch/geant4-data/datasets/${pname}.${version}.tar.gz";
@ -15,7 +15,7 @@ let
dontBuild = true; dontBuild = true;
dontConfigure = true; dontConfigure = true;
datadir = "${placeholder "out"}/share/Geant4-${geant_version}/data/${pname}${version}"; datadir = "${placeholder "out"}/share/Geant4-${geant4.version}/data/${pname}${version}";
installPhase = '' installPhase = ''
mkdir -p $datadir mkdir -p $datadir
mv ./* $datadir mv ./* $datadir

5
pkgs/development/libraries/physics/geant4/default.nix
View File

@ -106,10 +106,7 @@ stdenv.mkDerivation rec {
setupHook = ./geant4-hook.sh; setupHook = ./geant4-hook.sh;
passthru = { passthru = {
data = import ./datasets.nix { data = callPackage ./datasets.nix {};
inherit lib stdenv fetchurl;
geant_version = version;
};
tests = callPackage ./tests.nix {}; tests = callPackage ./tests.nix {};