diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2022-06-30 11:26:16 -0400 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2022-06-30 11:34:00 -0400 |
| commit | 6489c1e2a643c4cf7115eacabd31c0cfc898b1de (patch) | |
| tree | e812b2f4a2e838b23592a35a5060e21ed0ea439f /pkgs/development/libraries/physics | |
| parent | 714b6a7665d86acecea99e52e3e2af19bdb5712b (diff) | |
| download | nixpkgs-6489c1e2a643c4cf7115eacabd31c0cfc898b1de.tar nixpkgs-6489c1e2a643c4cf7115eacabd31c0cfc898b1de.tar.gz nixpkgs-6489c1e2a643c4cf7115eacabd31c0cfc898b1de.tar.bz2 nixpkgs-6489c1e2a643c4cf7115eacabd31c0cfc898b1de.tar.lz nixpkgs-6489c1e2a643c4cf7115eacabd31c0cfc898b1de.tar.xz nixpkgs-6489c1e2a643c4cf7115eacabd31c0cfc898b1de.tar.zst nixpkgs-6489c1e2a643c4cf7115eacabd31c0cfc898b1de.zip | |
geant4.data: refactor to use callPackage
This should enable some overriding capability.
Diffstat (limited to 'pkgs/development/libraries/physics')
| -rw-r--r-- | pkgs/development/libraries/physics/geant4/datasets.nix | 6 | ||||
| -rw-r--r-- | 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 18809654c46..b1df2875fab 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 8f724e21a0c..3a23d25d875 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 {}; |