fix(icns): Bundled opj_decompress depends on shared library

Close electron-userland/electron-builder#2636
develar · Mar 5, 2018 · 6e7329b · 6e7329b
1 parent 8d2b41c
commit 6e7329b
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/pkg/icons/icnsToPngUsingOpenJpeg.go b/pkg/icons/icnsToPngUsingOpenJpeg.go
@@ -113,18 +113,30 @@ func ConvertIcnsToPngUsingOpenJpeg(icnsPath string, outDir string) ([]IconInfo,
 		}
 
 		opjDecompressPath := "opj_decompress"
+		opjLibPath := ""
 		if !util.IsEnvTrue("USE_SYSTEM_OPG") && runtime.GOOS == "linux" && runtime.GOARCH == "amd64" {
 			opjDecompressPath, err = appimage.GetLinuxTool("opj_decompress")
 			if err != nil {
 				return nil, errors.WithStack(err)
 			}
+
+			opjLibPath = filepath.Join(filepath.Dir(opjDecompressPath), "lib")
 		}
 
 		pngFile := fmt.Sprintf("%s%d.png", outFileNamePrefix, imageInfo.Size)
 		imageInfo.File = pngFile
 
 		return func() error {
-			err = util.Execute(exec.Command(opjDecompressPath, "-quiet", "-i", jpeg2File, "-o", pngFile), "")
+			command := exec.Command(opjDecompressPath, "-quiet", "-i", jpeg2File, "-o", pngFile)
+			if len(opjLibPath) != 0 {
+				env := os.Environ()
+				env = append(env,
+					fmt.Sprintf("LD_LIBRARY_PATH=%s", opjLibPath+":"+os.Getenv("LD_LIBRARY_PATH")),
+				)
+				command.Env = env
+			}
+
+			err = util.Execute(command, "")
 			if err != nil {
 				return errors.WithStack(err)
 			}