pyrox.dev
lol
Merge pull request #113808 from OmnipotentEntity/geant4-10.7.1
geant4: 10.7.0 -> 10.7.1
+15
-6
+2
-2
pkgs/development/libraries/physics/geant4/datasets.nix
+2
-2
pkgs/development/libraries/physics/geant4/datasets.nix
+13
-4
pkgs/development/libraries/physics/geant4/default.nix
+13
-4
pkgs/development/libraries/physics/geant4/default.nix
···
21
21
22
22
# For enableQT.
23
23
, qtbase
24
+
, wrapQtAppsHook
24
25
25
26
# For enableXM.
26
27
, motif
···
48
49
in
49
50
50
51
stdenv.mkDerivation rec {
51
-
version = "10.7.0";
52
+
version = "10.7.1";
52
53
pname = "geant4";
53
54
54
55
src = fetchurl{
55
-
url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.07.tar.gz";
56
-
sha256 = "0jmdxb8z20d4l6sf2w0gk9ska48kylm38yngy3mzyvyj619a8vkp";
56
+
url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.07.p01.tar.gz";
57
+
sha256 = "07if874aljizkjyp21qj6v193pmyifyfmwi5kg8jm71x79sn2laj";
57
58
};
58
59
59
60
boost_python_lib = "python${builtins.replaceStrings ["."] [""] python3.pythonVersion}";
···
87
88
"-DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so"
88
89
];
89
90
90
-
nativeBuildInputs = [ cmake ];
91
+
nativeBuildInputs = [
92
+
cmake
93
+
] ++ lib.optionals enableQT [
94
+
wrapQtAppsHook
95
+
];
96
+
97
+
dontWrapQtApps = !enableQT;
91
98
92
99
buildInputs = [ libGLU xlibsWrapper libXmu ]
93
100
++ lib.optionals enableInventor [ libXpm coin3d soxt motif ]
···
101
108
postFixup = ''
102
109
# Don't try to export invalid environment variables.
103
110
sed -i 's/export G4\([A-Z]*\)DATA/#export G4\1DATA/' "$out"/bin/geant4.sh
111
+
'' + lib.optionalString enableQT ''
112
+
wrapQtAppsHook
104
113
'';
105
114
106
115
setupHook = ./geant4-hook.sh;