From fc3557e1d62af5af2c216691941977bafdbb2837 Mon Sep 17 00:00:00 2001 From: jolheiser Date: Sun, 9 Jul 2023 11:17:07 -0500 Subject: [PATCH] chore: move prospect-mail to NUR Signed-off-by: jolheiser --- machines/chai/default.nix | 7 +-- pkgs/prospect-mail/default.nix | 105 --------------------------------- 2 files changed, 2 insertions(+), 110 deletions(-) delete mode 100644 pkgs/prospect-mail/default.nix diff --git a/machines/chai/default.nix b/machines/chai/default.nix index a285cfd..0a3f5da 100644 --- a/machines/chai/default.nix +++ b/machines/chai/default.nix @@ -43,9 +43,6 @@ in { shell = pkgs.nushell; }; - nixpkgs.config.permittedInsecurePackages = [ - "nodejs-16.20.1" - ]; environment.systemPackages = with pkgs; [ globalprotect-openconnect jetbrains.pycharm-professional @@ -54,8 +51,8 @@ in { teams-for-linux xorg.xauth - # Custom packages - (callPackage ../../pkgs/prospect-mail {}) + # Personal NUR + nur.repos.jolheiser.prospect-mail ]; system.stateVersion = "22.11"; diff --git a/pkgs/prospect-mail/default.nix b/pkgs/prospect-mail/default.nix deleted file mode 100644 index cf8675e..0000000 --- a/pkgs/prospect-mail/default.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - makeWrapper, - makeDesktopItem, - copyDesktopItems, - nodejs_16, - fetchYarnDeps, - fixup_yarn_lock, - electron, - libpulseaudio, - pipewire, - alsa-utils, - which, -}: -stdenv.mkDerivation rec { - pname = "prospect-mail"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "julian-alarcon"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-MIQgJFTqXuhShEU+iAV1VS2TAq1d/fQXU1Rct1XIEsM="; - }; - - offlineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; - sha256 = "sha256-rN15aGTROnfUgws7f+U8DXcj5dL6MC8DqUE+uxfH1Zo="; - }; - - nativeBuildInputs = [nodejs_16.pkgs.yarn fixup_yarn_lock nodejs_16 copyDesktopItems makeWrapper]; - - configurePhase = '' - runHook preConfigure - - export HOME=$(mktemp -d) - yarn config --offline set yarn-offline-mirror $offlineCache - fixup_yarn_lock yarn.lock - yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive - patchShebangs node_modules/ - - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - - yarn --offline electron-builder \ - --dir ${ - if stdenv.isDarwin - then "--macos" - else "--linux" - } ${ - if stdenv.hostPlatform.isAarch64 - then "--arm64" - else "--x64" - } \ - -c.electronDist=${electron}/lib/electron \ - -c.electronVersion=${electron.version} - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/{applications,prospect-mail} - cp dist/${ - if stdenv.isDarwin - then "darwin-" - else "linux-" - }${lib.optionalString stdenv.hostPlatform.isAarch64 "arm64-"}unpacked/resources/app.asar $out/share/prospect-mail/ - - pushd build/icons - for image in *png; do - mkdir -p $out/share/icons/hicolor/''${image%.png}/apps - cp -r $image $out/share/icons/hicolor/''${image%.png}/apps/prospect-mail.png - done - popd - - # Linux needs 'aplay' for notification sounds, 'libpulse' for meeting sound, and 'libpipewire' for screen sharing - makeWrapper '${electron}/bin/electron' "$out/bin/prospect-mail" \ - ${lib.optionalString stdenv.isLinux '' - --prefix PATH : ${lib.makeBinPath [alsa-utils which]} \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [libpulseaudio pipewire]} \ - ''} \ - --add-flags "$out/share/prospect-mail/app.asar" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" - - runHook postInstall - ''; - - desktopItems = [ - (makeDesktopItem { - name = pname; - exec = pname; - icon = pname; - desktopName = "Outlook for Linux"; - comment = "Outlook wrapper client for Linux"; - categories = ["Network" "Email"]; - }) - ]; -}