summary refs log tree commit diff
path: root/pkgs/applications/science/physics/crystfel/libccp4-use-hardcoded-syminfo-lib.patch
blob: 1806d9b2b9dad7773be98822d667ee859b7d1630 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
diff --git a/ccp4/csymlib.c b/ccp4/csymlib.c
index 76bc70b..3616121 100644
--- a/ccp4/csymlib.c
+++ b/ccp4/csymlib.c
@@ -136,25 +136,7 @@ CCP4SPG *ccp4spg_load_spacegroup(const int numspg, const int ccp4numspg,
     }
   }
 
-  /* Open the symop file: */
-  if (!(symopfile = getenv("SYMINFO"))) {
-    if (debug)
-      printf("Environment variable SYMINFO not set ... guessing location of symmetry file. \n");
-    if (!(ccp4dir = getenv("CLIBD"))) {
-      printf("Environment variable CLIBD not set ... big trouble! \n");
-      return NULL;
-    }
-
-    symopfile = ccp4_utils_malloc((strlen(ccp4dir)+22)*sizeof(char));
-    strcpy(symopfile,ccp4_utils_joinfilenames(ccp4dir,"syminfo.lib"));
-    symopfile[strlen(ccp4dir)+21] = '\0';
-    ccp4printf(1," SYMINFO file set to %s \n",symopfile);
-  } else {
-    if (debug) {
-      ccp4printf(1,"\n Spacegroup information obtained from library file: \n");
-      ccp4printf(1," Logical Name: SYMINFO   Filename: %s\n\n",symopfile);
-    }
-  }
+  symopfile = NIX_PROVIDED_SYMOP_FILE;
 
   filein = fopen(symopfile,"r");
   if (!filein) {
@@ -162,8 +144,6 @@ CCP4SPG *ccp4spg_load_spacegroup(const int numspg, const int ccp4numspg,
     return NULL;
   }
 
-  if (!(getenv("SYMINFO"))) free(symopfile);
-
   parser = ccp4_parse_start(20);
   if (parser == NULL) 
     ccp4_signal(CSYM_ERRNO(CSYMERR_ParserFail),"ccp4spg_load_spacegroup",NULL);