File tree 2 files changed +6
-2
lines changed
2 files changed +6
-2
lines changed Original file line number Diff line number Diff line change 34
34
},
35
35
"dependencies" : {
36
36
"debug" : " ^3.1.0" ,
37
- "electron-installer-common" : " ^0.1 .0" ,
37
+ "electron-installer-common" : " ^0.2 .0" ,
38
38
"fs-extra" : " ^5.0.0" ,
39
39
"lodash" : " ^4.17.4" ,
40
40
"nodeify" : " ^1.0.1" ,
Original file line number Diff line number Diff line change 3
3
const _ = require ( 'lodash' )
4
4
const common = require ( 'electron-installer-common' )
5
5
const debug = require ( 'debug' )
6
+ const dependencies = require ( 'electron-installer-common/src/dependencies' )
6
7
const fs = require ( 'fs-extra' )
7
8
const nodeify = require ( 'nodeify' )
8
9
const path = require ( 'path' )
@@ -78,7 +79,10 @@ function getOptions (data, defaults) {
78
79
79
80
// Wrap the extended description to avoid rpmlint warning about
80
81
// `description-line-too-long`.
81
- options . productDescription = wrap ( options . productDescription , { width : 80 , indent : '' } )
82
+ options . productDescription = wrap ( options . productDescription , { width : 80 , indent : '' } )
83
+
84
+ // Merges user and default dependencies
85
+ options . requires = dependencies . mergeUserSpecified ( data , 'requires' , defaults )
82
86
83
87
// Scan if there are any installation scripts and adds them to the options
84
88
return generateScripts ( options )
You can’t perform that action at this time.
0 commit comments