Commit 4406feaf authored by Cryolitia PukNgae's avatar Cryolitia PukNgae
Browse files

gridtracker2: 2.250820.0 -> 2.250914.1 

The runtimeInputs seems not needed. It's electron's dependency but not directly gridtracker2's.

Due to [1], update electron to newest. LGTM.

1. https://github.com/NixOS/nixpkgs/pull/442413



Signed-off-by: default avatarCryolitia PukNgae <Cryolitia@gmail.com>
parent 6cc7008a

pkgs/by-name/gr/gridtracker2/package-lock.json

+154 −164

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/by-name/gr/gridtracker2/package.nix

+4 −31
Original line number Diff line number Diff line
@@ -3,23 +3,13 @@ 
  stdenv,

  copyDesktopItems,

  buildNpmPackage,

  electron_35,

  electron,

  fetchFromGitLab,

  makeBinaryWrapper,

  makeDesktopItem,

  at-spi2-atk,

  gtk3,

  libappindicator-gtk3,

  libnotify,

  libsecret,

  libuuid,

  nss,

  xdg-utils,

  xorg,

}:

let

  version = "2.250820.0";

  electron = electron_35;

  version = "2.250914.1";

in

buildNpmPackage (finalAttrs: {

  pname = "gridtracker2";
@@ -29,10 +19,10 @@ buildNpmPackage (finalAttrs: { 
    owner = "gridtracker.org";

    repo = "gridtracker2";

    tag = "v${version}";

    hash = "sha256-d40oq8UXNFaybjbbhqV8Gfkj8SEdTuF92Y0elW9dksY=";

    hash = "sha256-ME68kGRlIRPs5tUOGb3g2CXJKC52QuMuTMc1ctAMzlk=";

  };



  npmDepsHash = "sha256-q9QGNYMmeNCouPW9GFsVHSYK9T8N7H4hg6hkOtjmLAY=";

  npmDepsHash = "sha256-MUXwJPo/A0gxtUbM3MOWfMcspM1losuDhc5XTc2oqCo=";



  nativeBuildInputs = [

    makeBinaryWrapper
@@ -91,21 +81,6 @@ buildNpmPackage (finalAttrs: { 
    runHook postBuild

  '';



  runtimeInputs = [

    at-spi2-atk

    gtk3

    libnotify

    libsecret

    libuuid

    nss

    xdg-utils

    xorg.libXScrnSaver

    xorg.libXtst

  ]

  ++ lib.optionals stdenv.isLinux [

    libappindicator-gtk3

  ];



  installPhase = ''

    runHook preInstall
@@ -120,8 +95,6 @@ buildNpmPackage (finalAttrs: { 


    makeWrapper ${lib.getExe electron} $out/bin/gridtracker2 \

      --add-flags $out/share/gridtracker2/resources/app.asar \

      --prefix PATH : "${lib.makeBinPath finalAttrs.runtimeInputs}" \

      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.runtimeInputs}" \

      --add-flags "--no-sandbox --disable-gpu-sandbox" \

      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \

      --inherit-argv0