Skip to content

Commit

Permalink
node-sqlcipher update: always build, statically link openssl
Browse files Browse the repository at this point in the history
  • Loading branch information
scottnonnenberg-signal committed Aug 3, 2018
1 parent c56ea55 commit fe84e92
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
1 change: 0 additions & 1 deletion .yarnclean
Expand Up @@ -36,7 +36,6 @@ Gruntfile.js
.*.yml

# misc
*.gz
*.md

# asset directories
Expand Down
5 changes: 3 additions & 2 deletions package.json
Expand Up @@ -52,7 +52,7 @@
"electron-config": "^1.0.0",
"electron-editor-context-menu": "^1.1.1",
"electron-is-dev": "^0.3.0",
"@journeyapps/sqlcipher": "https://github.com/scottnonnenberg-signal/node-sqlcipher.git#ba2e16aef2a0b513135fc9857ca7be28052c4f88",
"@journeyapps/sqlcipher": "https://github.com/scottnonnenberg-signal/node-sqlcipher.git#782b5bb1e9468df811287a4a4c8a97803e4fcefe",
"electron-unhandled": "https://github.com/scottnonnenberg-signal/electron-unhandled.git#7496187472aa561d39fcd4c843a54ffbef0a388c",
"electron-updater": "^2.21.10",
"emoji-datasource": "4.0.0",
Expand Down Expand Up @@ -255,7 +255,8 @@
"!**/._*",
"!**/{.DS_Store,.git,.hg,.svn,CVS,RCS,SCCS,__pycache__,thumbs.db,.gitignore,.gitattributes,.editorconfig,.flowconfig,.yarn-metadata.json,.idea,appveyor.yml,.travis.yml,circle.yml,npm-debug.log,.nyc_output,yarn.lock,.yarn-integrity}",
"node_modules/spellchecker/build/Release/*.node",
"node_modules/websocket/build/Release/*.node"
"node_modules/websocket/build/Release/*.node",
"!node_modules/@journeyapps/sqlcipher/deps/*"
]
}
}
4 changes: 2 additions & 2 deletions yarn.lock
Expand Up @@ -22,9 +22,9 @@
"7zip-bin-mac" "~1.0.1"
"7zip-bin-win" "~2.2.0"

"@journeyapps/sqlcipher@https://github.com/scottnonnenberg-signal/node-sqlcipher.git#ba2e16aef2a0b513135fc9857ca7be28052c4f88":
"@journeyapps/sqlcipher@https://github.com/scottnonnenberg-signal/node-sqlcipher.git#782b5bb1e9468df811287a4a4c8a97803e4fcefe":
version "3.2.1"
resolved "https://github.com/scottnonnenberg-signal/node-sqlcipher.git#ba2e16aef2a0b513135fc9857ca7be28052c4f88"
resolved "https://github.com/scottnonnenberg-signal/node-sqlcipher.git#782b5bb1e9468df811287a4a4c8a97803e4fcefe"
dependencies:
nan "^2.10.0"
node-pre-gyp "^0.10.0"
Expand Down

0 comments on commit fe84e92

Please sign in to comment.