From e380a8f3e0dc87b546a8bff1c41113220435ec7e Mon Sep 17 00:00:00 2001 From: Mikael Fangel <34864484+MikaelFangel@users.noreply.github.com> Date: Sat, 11 May 2024 23:17:51 +0200 Subject: [PATCH 1/2] nwjs: change license to MIT --- pkgs/development/tools/nwjs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index 408584de712e..91cc9b7634d4 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -139,13 +139,13 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = with lib; { + meta = { description = "App runtime based on Chromium and node.js"; homepage = "https://nwjs.io/"; platforms = [ "i686-linux" "x86_64-linux" ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = [ maintainers.mikaelfangel ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + maintainers = [ lib.maintainers.mikaelfangel ]; mainProgram = "nw"; - license = licenses.bsd3; + license = lib.licenses.mit; }; } From 06d1364d1d2931d50b2143243859a34a92cd18d2 Mon Sep 17 00:00:00 2001 From: Mikael Fangel <34864484+MikaelFangel@users.noreply.github.com> Date: Sat, 11 May 2024 23:23:03 +0200 Subject: [PATCH 2/2] nwjs: simplify the bits variable assignment Update pkgs/development/tools/nwjs/default.nix Co-authored-by: Arne Keller <2012gdwu+github@posteo.de> --- pkgs/development/tools/nwjs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index 91cc9b7634d4..5dfb16ded79e 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -37,7 +37,7 @@ }: let - bits = if stdenv.hostPlatform.system == "x86_64-linux" then "x64" else "ia32"; + bits = if stdenv.hostPlatform.is64bit then "x64" else "ia32"; nwEnv = buildEnv { name = "nwjs-env";