From eb73bbd5bc5038b295025cfe9a3267e451405a92 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 d66197d7f672d02..b895a57c96df853 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -137,13 +137,13 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = with lib; { + meta = { description = "An 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 facb9340b1458cd1b4ea4ce4b9dd8c606cd7d8cd 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 --- 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 b895a57c96df853..9f2986288ed8838 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.is64bit then "x64" else "ia32"; nwEnv = buildEnv { name = "nwjs-env";