pyrox.dev
Merge pull request #217982 from pmiddend/crystfel-0.10.2
crystfel: 0.10.1 → 0.10.2
+10
-6
pkgs/applications/science/physics/crystfel/default.nix
+10
-6
pkgs/applications/science/physics/crystfel/default.nix
···
2
2
, stdenv
3
3
, fetchurl
4
4
, fetchFromGitHub
5
+
, fetchpatch
5
6
, cmake
6
7
, lz4
7
8
, bzip2
···
9
10
, m4
10
11
, hdf5
11
12
, gsl
12
-
, slurm
13
13
, unzip
14
14
, makeWrapper
15
15
, meson
···
161
161
in
162
162
stdenv.mkDerivation rec {
163
163
pname = "crystfel";
164
-
version = "0.10.1";
164
+
version = "0.10.2";
165
165
src = fetchurl {
166
166
url = "https://www.desy.de/~twhite/${pname}/${pname}-${version}.tar.gz";
167
-
sha256 = "0i9d5ggalic7alj97dxjdys7010kxhm2cb4lwakvigl023j8ms79";
167
+
sha256 = "sha256-nCO9ndDKS54bVN9IhFBiCVNzqk7BsCljXFrOmlx+sP4=";
168
168
};
169
169
nativeBuildInputs = [ meson pkg-config ninja flex bison doxygen opencl-headers makeWrapper ]
170
170
++ lib.optionals withGui [ wrapGAppsHook ];
···
186
186
argp-standalone
187
187
memorymappingHook
188
188
]
189
-
# slurm is not available for Darwin; when it is, remove the condition
190
-
++ lib.optionals (!stdenv.isDarwin) [ slurm ]
191
189
# hdf5-external-filter-plugins doesn't link on Darwin
192
190
++ lib.optionals (withBitshuffle && !stdenv.isDarwin) [ hdf5-external-filter-plugins ];
193
191
194
-
patches = [ ./link-to-argp-standalone-if-needed.patch ];
192
+
patches = [
193
+
./link-to-argp-standalone-if-needed.patch
194
+
(fetchpatch {
195
+
url = "https://gitlab.desy.de/thomas.white/crystfel/-/commit/3c54d59e1c13aaae716845fed2585770c3ca9d14.diff";
196
+
hash = "sha256-oaJNBQQn0c+z4p1pnW4osRJA2KdKiz4hWu7uzoKY7wc=";
197
+
})
198
+
];
195
199
196
200
# CrystFEL calls mosflm by searching PATH for it. We could've create a wrapper script that sets the PATH, but
197
201
# we'd have to do that for every CrystFEL executable (indexamajig, crystfel, partialator). Better to just
+12
-12
pkgs/applications/science/physics/crystfel/link-to-argp-standalone-if-needed.patch
+12
-12
pkgs/applications/science/physics/crystfel/link-to-argp-standalone-if-needed.patch
···
1
1
diff --git a/meson.build b/meson.build
2
-
index efc9002b..070f37e4 100644
2
+
index 59bbcfb7..dd75d4e2 100644
3
3
--- a/meson.build
4
4
+++ b/meson.build
5
-
@@ -34,6 +34,12 @@ if slurmdep.found()
6
-
conf_data.set10('HAVE_SLURM', 1)
5
+
@@ -80,6 +80,12 @@ if cc.has_function('clock_gettime', prefix: '#include <time.h>')
6
+
conf_data.set10('HAVE_CLOCK_GETTIME', true)
7
7
endif
8
8
9
9
+if build_machine.system() == 'darwin' or build_machine.system() == 'freebsd' or not cc.links('#include <argp.h>\nstatic error_t parse_opt (int key, char *arg, struct argp_state *state) { argp_usage(state); return 0; }; void main() {}')
···
12
12
+ argpdep = dependency('', required : false)
13
13
+endif
14
14
+
15
-
# Find HDF5 using inbuilt Meson methods. Requires Meson >= 0.50.0
16
-
hdf5dep = dependency('hdf5', language: 'c', required: true)
15
+
# ************************ libcrystfel (subdir) ************************
17
16
18
-
@@ -180,7 +186,7 @@ if zmqdep.found()
19
-
endif
17
+
subdir('libcrystfel')
18
+
@@ -180,7 +186,7 @@ endif
20
19
21
-
executable('indexamajig', indexamajig_sources,
22
-
- dependencies: [mdep, libcrystfeldep, gsldep, pthreaddep, zmqdep],
23
-
+ dependencies: [mdep, libcrystfeldep, gsldep, pthreaddep, zmqdep, argpdep],
24
-
install: true,
25
-
install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib')
20
+
indexamajig = executable('indexamajig', indexamajig_sources,
21
+
dependencies: [mdep, libcrystfeldep, gsldep,
22
+
- pthreaddep, zmqdep, asapodep],
23
+
+ pthreaddep, zmqdep, asapodep, argpdep],
24
+
install: true,
25
+
install_rpath: '$ORIGIN/../lib64/:$ORIGIN/../lib')
26
26