From 11313ae4112f884e5d70bc342d361726c69cf3e2 Mon Sep 17 00:00:00 2001 From: wucke13 Date: Mon, 29 Nov 2021 18:38:59 +0100 Subject: [PATCH] nwjs: 0.33.4 -> 0.54.1 The later versions depend on GLIBC_2.33, which is not yet available in the nixpkgs. Hence only the update to a newer but not the newest release. --- pkgs/development/tools/nwjs/default.nix | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index a4a54717febe..f3ec2dabc923 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -1,7 +1,8 @@ { stdenv, lib, fetchurl, buildEnv, makeWrapper -, xorg, alsa-lib, dbus, glib, gtk3, atk, pango, freetype, fontconfig -, gdk-pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap +, xorg, alsa-lib, at-spi2-core, dbus, glib, gtk3, atk, pango, freetype +, fontconfig , gdk-pixbuf, cairo, mesa, nss, nspr, gconf, expat, systemd +, libcap, libdrm, libxkbcommon , libnotify , ffmpeg, libxcb, cups , sqlite, udev @@ -15,12 +16,13 @@ let nwEnv = buildEnv { name = "nwjs-env"; 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 - 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.libXScrnSaver cups - libcap libnotify + xorg.libXScrnSaver xorg.libxshmfence cups + libcap libdrm libnotify + libxkbcommon # libnw-specific (not chromium dependencies) ffmpeg libxcb # chromium runtime deps (dlopen’d) @@ -33,18 +35,18 @@ let in stdenv.mkDerivation rec { pname = "nwjs"; - version = "0.33.4"; + version = "0.54.1"; 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"; + "sha256-1qeU4+EIki0M7yJPkRuzFwMdswfDOni5gltdmM6A/ds=" else + "sha256-wDEGePE9lrKa6OAzeiDLhVj992c0TJgiMHb8lJ4PF80="; } else fetchurl { url = "https://dl.nwjs.io/v${version}/nwjs-v${version}-linux-${bits}.tar.gz"; sha256 = if bits == "x64" then - "09zd6gja3l20xx03h2gawpmh9f8nxqjp8qdkds5nz9kbbckhkj52" else - "0nlpdz76k1p1pq4xygfr2an91m0d7p5fjyg2xhiggyy8b7sp4964"; + "sha256-TACEM06K2t6dDXRD44lSW7GRi77yzSW4BZJw8gT+fl4=" else + "sha256-yX9knqFV5VQTT3TJDmQoDgt17NqH8fLt+bLQAqKleTU="; }; # we have runtime deps like sqlite3 that should remain