diff --git a/pkgs/by-name/su/super-productivity/package.nix b/pkgs/by-name/su/super-productivity/package.nix index 78fe7df51084..787b57039a6e 100644 --- a/pkgs/by-name/su/super-productivity/package.nix +++ b/pkgs/by-name/su/super-productivity/package.nix @@ -7,27 +7,25 @@ makeDesktopItem, nix-update-script, npm-lockfile-fix, - python3, stdenv, }: buildNpmPackage rec { pname = "super-productivity"; - version = "12.0.5"; + version = "13.0.10"; src = fetchFromGitHub { owner = "johannesjo"; repo = "super-productivity"; tag = "v${version}"; - hash = "sha256-+Xw1WZXvZUOdA/ZpLdLCQAy8cmQ9QTiSDRMgj5+jeNw="; + hash = "sha256-2K/6T4f9tLlrKimT/DPSdoz8LHij5nsaF6BWSQf6u7U="; postFetch = '' ${lib.getExe npm-lockfile-fix} -r $out/package-lock.json ''; }; - npmDepsHash = "sha256-SAmSvdPlJFDE6TQCr932MfPzlwDtGcm4YdHesVA6j8c="; - npmFlags = [ "--legacy-peer-deps" ]; + npmDepsHash = "sha256-l9P11ZvLYiTu/cVPQIw391ZTJ0K+cNPUzoVMsdze2uo="; makeCacheWritable = true; env = { @@ -36,19 +34,11 @@ buildNpmPackage rec { CSC_IDENTITY_AUTO_DISCOVERY = "false"; }; - nativeBuildInputs = - [ copyDesktopItems ] - ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ - (python3.withPackages (ps: [ ps.setuptools ])) - ]; + nativeBuildInputs = [ copyDesktopItems ]; - # package.json does not include `core-js` and the comment suggests - # it is only needed on some mobile platforms postPatch = '' substituteInPlace electron-builder.yaml \ --replace-fail "notarize: true" "notarize: false" - substituteInPlace src/polyfills.ts \ - --replace-fail "import 'core-js/es/object';" "" ''; buildPhase = '' @@ -58,8 +48,8 @@ buildNpmPackage rec { cp -r ${electron.dist} electron-dist chmod -R u+w electron-dist - npm run buildFrontend:prod:es6 - npm run electron:build + npm run prepare + npm run build npm exec electron-builder -- --dir \ -c.electronDist=electron-dist \ -c.electronVersion=${electron.version} @@ -79,18 +69,12 @@ buildNpmPackage rec { '' else '' - mkdir -p $out/share/super-productivity/{app,defaults,static/plugins,static/resources/plugins} - cp -r app-builds/*-unpacked/{locales,resources{,.pak}} "$out/share/super-productivity/app" - - for size in 16 32 48 64 128 256 512 1024; do - local sizexsize="''${size}x''${size}" - mkdir -p $out/share/icons/hicolor/$sizexsize/apps - cp -v build/icons/$sizexsize.png \ - $out/share/icons/hicolor/$sizexsize/apps/super-productivity.png - done + mkdir -p $out/share/{super-productivity,icons/hicolor/scalable/apps} + cp -r app-builds/*-unpacked/resources/app.asar $out/share/super-productivity + cp electron/assets/icons/ico-circled.svg $out/share/icons/hicolor/scalable/apps/super-productivity.svg makeWrapper '${lib.getExe electron}' "$out/bin/super-productivity" \ - --add-flags "$out/share/super-productivity/app/resources/app.asar" \ + --add-flags "$out/share/super-productivity/app.asar" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ --inherit-argv0 @@ -110,8 +94,11 @@ buildNpmPackage rec { type = "Application"; icon = "super-productivity"; startupWMClass = "superProductivity"; - comment = builtins.replaceStrings [ "\n" ] [ " " ] meta.longDescription; - categories = [ "Utility" ]; + comment = "ToDo list and Time Tracking"; + categories = [ + "Office" + "ProjectManagement" + ]; }) ];