diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-08-08 21:40:31 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-08-16 00:21:02 +0200 |
commit | 2053ddac783c931053676ebc2b02bc8b82d89399 (patch) | |
tree | 2f5a9533bc41a482533993f00c9fd3ca4d2b108b /pkgs/webapps/peertube | |
parent | 69e6151c0c324f920eccb34568ed7ff523592589 (diff) | |
download | Nix-2053ddac783c931053676ebc2b02bc8b82d89399.tar.gz Nix-2053ddac783c931053676ebc2b02bc8b82d89399.tar.zst Nix-2053ddac783c931053676ebc2b02bc8b82d89399.zip |
Upgrade nixos-unstable
Diffstat (limited to 'pkgs/webapps/peertube')
-rw-r--r-- | pkgs/webapps/peertube/default.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/webapps/peertube/default.nix b/pkgs/webapps/peertube/default.nix index dd3a462..c38cc15 100644 --- a/pkgs/webapps/peertube/default.nix +++ b/pkgs/webapps/peertube/default.nix | |||
@@ -3,7 +3,7 @@ | |||
3 | let | 3 | let |
4 | nodeHeaders = fetchurl { | 4 | nodeHeaders = fetchurl { |
5 | url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz"; | 5 | url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz"; |
6 | sha256 = "1prvrcvbyal39k9axfwjixs4wfgs1m8xy4prsl0kq0s0n7r7nxzj"; | 6 | sha256 = "12415ss4fxxafp3w8rxp2jbb16y0d7f01b7wv72nmy3cwiqxqkhn"; |
7 | }; | 7 | }; |
8 | source = mylibs.fetchedGithub ./peertube.json; | 8 | source = mylibs.fetchedGithub ./peertube.json; |
9 | patchedSource = stdenv.mkDerivation (source // rec { | 9 | patchedSource = stdenv.mkDerivation (source // rec { |
@@ -43,12 +43,17 @@ let | |||
43 | bcrypt = { | 43 | bcrypt = { |
44 | buildInputs = [ nodePackages.node-pre-gyp ]; | 44 | buildInputs = [ nodePackages.node-pre-gyp ]; |
45 | postInstall = let | 45 | postInstall = let |
46 | node_module_version = "72"; | ||
46 | bcrypt_lib = fetchurl { | 47 | bcrypt_lib = fetchurl { |
47 | url = "https://github.com/kelektiv/node.bcrypt.js/releases/download/v3.0.7/bcrypt_lib-v3.0.7-node-v64-linux-x64-glibc.tar.gz"; | 48 | url = "https://github.com/kelektiv/node.bcrypt.js/releases/download/v3.0.7/bcrypt_lib-v3.0.7-node-v${node_module_version}-linux-x64-glibc.tar.gz"; |
48 | sha256 = "0gbq4grhp5wl0f9yqb4y43kjfh8nivfd6y0nkv1x6gfvs2v23wb0"; | 49 | sha256 = "0kpm9j0yc4lqsafldfsql3m72rr1fapljlb6ddxvy3zi13rb7ppx"; |
49 | }; | 50 | }; |
50 | in | 51 | in |
51 | '' | 52 | '' |
53 | if [ "$(node -e "console.log(process.versions.modules)")" != "${node_module_version}" ]; then | ||
54 | echo "mismatching version with nodejs please update bcrypt derivation" | ||
55 | false | ||
56 | fi | ||
52 | mkdir lib && tar -C lib -xf ${bcrypt_lib} | 57 | mkdir lib && tar -C lib -xf ${bcrypt_lib} |
53 | patchShebangs ../node-pre-gyp | 58 | patchShebangs ../node-pre-gyp |
54 | npm run install | 59 | npm run install |