dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #147921 from wucke13/dev/nwjs-update

Browse Source
This commit is contained in:
Sandro 2021-11-29 21:47:18 +01:00 committed by GitHub
commit 548a9c42c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/development/tools/nwjs/default.nix
View File

@ -1,7 +1,8 @@
{ stdenv, lib, fetchurl, buildEnv, makeWrapper { stdenv, lib, fetchurl, buildEnv, makeWrapper
, xorg, alsa-lib, dbus, glib, gtk3, atk, pango, freetype, fontconfig , xorg, alsa-lib, at-spi2-core, dbus, glib, gtk3, atk, pango, freetype
, gdk-pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap , fontconfig , gdk-pixbuf, cairo, mesa, nss, nspr, gconf, expat, systemd
, libcap, libdrm, libxkbcommon
, libnotify , libnotify
, ffmpeg, libxcb, cups , ffmpeg, libxcb, cups
, sqlite, udev , sqlite, udev
@ -15,12 +16,13 @@ let
nwEnv = buildEnv { nwEnv = buildEnv {
name = "nwjs-env"; name = "nwjs-env";
paths = [ paths = [
xorg.libX11 xorg.libXrender glib /*gtk2*/ gtk3 atk pango cairo gdk-pixbuf xorg.libX11 xorg.libXrender glib gtk3 atk at-spi2-core pango cairo gdk-pixbuf
freetype fontconfig xorg.libXcomposite alsa-lib xorg.libXdamage freetype fontconfig xorg.libXcomposite alsa-lib xorg.libXdamage
xorg.libXext xorg.libXfixes nss nspr gconf expat dbus xorg.libXext xorg.libXfixes mesa nss nspr gconf expat dbus
xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr
xorg.libXScrnSaver cups xorg.libXScrnSaver xorg.libxshmfence cups
libcap libnotify libcap libdrm libnotify
libxkbcommon
# libnw-specific (not chromium dependencies) # libnw-specific (not chromium dependencies)
ffmpeg libxcb ffmpeg libxcb
# chromium runtime deps (dlopen’d) # chromium runtime deps (dlopen’d)
@ -33,18 +35,18 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "nwjs"; pname = "nwjs";
version = "0.33.4"; version = "0.54.1";
src = if sdk then fetchurl { src = if sdk then fetchurl {
url = "https://dl.nwjs.io/v${version}/nwjs-sdk-v${version}-linux-${bits}.tar.gz"; url = "https://dl.nwjs.io/v${version}/nwjs-sdk-v${version}-linux-${bits}.tar.gz";
sha256 = if bits == "x64" then sha256 = if bits == "x64" then
"1hi6xispxvyb6krm5j11mv8509dwpw5ikpbkvq135gsk3gm29c9y" else "sha256-1qeU4+EIki0M7yJPkRuzFwMdswfDOni5gltdmM6A/ds=" else
"00p4clbfinrj5gp2i84a263l3h00z8g7mnx61qwmr0z02kvswz9s"; "sha256-wDEGePE9lrKa6OAzeiDLhVj992c0TJgiMHb8lJ4PF80=";
} else fetchurl { } else fetchurl {
url = "https://dl.nwjs.io/v${version}/nwjs-v${version}-linux-${bits}.tar.gz"; url = "https://dl.nwjs.io/v${version}/nwjs-v${version}-linux-${bits}.tar.gz";
sha256 = if bits == "x64" then sha256 = if bits == "x64" then
"09zd6gja3l20xx03h2gawpmh9f8nxqjp8qdkds5nz9kbbckhkj52" else "sha256-TACEM06K2t6dDXRD44lSW7GRi77yzSW4BZJw8gT+fl4=" else
"0nlpdz76k1p1pq4xygfr2an91m0d7p5fjyg2xhiggyy8b7sp4964"; "sha256-yX9knqFV5VQTT3TJDmQoDgt17NqH8fLt+bLQAqKleTU=";
}; };
# we have runtime deps like sqlite3 that should remain # we have runtime deps like sqlite3 that should remain