From 34f20090d3878d6a313660d1ecf1439ae1ea5119 Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii Date: Tue, 2 Oct 2018 01:24:05 -0700 Subject: [PATCH] nwjs-sdk: init at 0.33.4 (#45320) --- pkgs/development/tools/nwjs/default.nix | 16 ++++++++++++---- pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index 04cbdb6f574825..211934080c8f56 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -5,6 +5,8 @@ , libnotify , ffmpeg, libxcb, cups , sqlite, udev +, libuuid +, sdk ? false }: let bits = if stdenv.hostPlatform.system == "x86_64-linux" then "x64" @@ -23,6 +25,7 @@ let ffmpeg libxcb # chromium runtime deps (dlopen’d) sqlite udev + libuuid ]; extraOutputsToInstall = [ "lib" "out" ]; @@ -30,13 +33,18 @@ let in stdenv.mkDerivation rec { name = "nwjs-${version}"; - version = "0.32.4"; + version = "0.33.4"; - src = fetchurl { + src = if sdk then fetchurl { + url = "https://dl.nwjs.io/v${version}/nwjs-sdk-v${version}-linux-${bits}.tar.gz"; + sha256 = if bits == "x64" then + "1hi6xispxvyb6krm5j11mv8509dwpw5ikpbkvq135gsk3gm29c9y" else + "00p4clbfinrj5gp2i84a263l3h00z8g7mnx61qwmr0z02kvswz9s"; + } else fetchurl { url = "https://dl.nwjs.io/v${version}/nwjs-v${version}-linux-${bits}.tar.gz"; sha256 = if bits == "x64" then - "0hzyiy6sbbjll1b946y3v7bv6sav3rhy4c48d4vcvamyv9pkfn45" else - "0a3b712abfa0c3e7e808b1d08ea5d53375a71060e7d144fdcb58c4fe88fa2250"; + "09zd6gja3l20xx03h2gawpmh9f8nxqjp8qdkds5nz9kbbckhkj52" else + "0nlpdz76k1p1pq4xygfr2an91m0d7p5fjyg2xhiggyy8b7sp4964"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce6c103f9653ec..bcaf137045e3bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8600,6 +8600,11 @@ with pkgs; gconf = pkgs.gnome2.GConf; }; + nwjs-sdk = callPackage ../development/tools/nwjs { + gconf = pkgs.gnome2.GConf; + sdk = true; + }; + # only kept for nixui, see https://github.com/matejc/nixui/issues/27 nwjs_0_12 = callPackage ../development/tools/node-webkit/nw12.nix { gconf = pkgs.gnome2.GConf;