jolheiser
/
nur
1
0
Fork 0
Code Issues Activity

fix: prospect-mail back to original repo 

Signed-off-by: jolheiser <john.olheiser@gmail.com>
main
jolheiser 2023-09-14 12:03:22 -05:00
parent 0b20c61727
commit cd1bd15f51
Signed by: jolheiser
GPG Key ID: B853ADA5DA7BBF7A
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
justfile
View File

@ -6,7 +6,8 @@ readme:
@nu -c 'nu README.nu | save --force README.md' @nu -c 'nu README.nu | save --force README.md'
build package: build package:
@nix-build -E 'with import <nixpkgs> { }; callPackage ./pkgs/{{package}} { }' @git add .
@nix build .#{{package}}
update-flake: update-flake:
@nix flake update @nix flake update

18
pkgs/prospect-mail/default.nix
View File

@ -5,7 +5,7 @@
makeWrapper, makeWrapper,
makeDesktopItem, makeDesktopItem,
copyDesktopItems, copyDesktopItems,
nodejs_18, nodejs_20,
fetchYarnDeps, fetchYarnDeps,
fixup_yarn_lock, fixup_yarn_lock,
electron, electron,
@ -16,21 +16,21 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "prospect-mail"; pname = "prospect-mail";
version = "0.5.2"; version = "24e49ca0187884fa772a5928c56d7a9ed76441bd";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jolheiser"; owner = "julian-alarcon";
repo = pname; repo = pname;
rev = "v${version}"; rev = version;
sha256 = "sha256-ptbxXYWwvalkC1PdCRUbtj23KrAv42HhUS6EUhLgjNY="; sha256 = "sha256-taFVVExBKsE6GToiNWh8E0tVlx8qaWw5t8krydyiG24=";
}; };
offlineCache = fetchYarnDeps { offlineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock"; yarnLock = "${src}/yarn.lock";
sha256 = "sha256-tenHW93GF9rQs9AyEv4Nkike0IAry3qI+geZ5LKbrgo="; sha256 = "sha256-bWVJvhaEue47uXzQQg7OPI6bjVcbmWcacmBeXTc8A6c=";
}; };
nativeBuildInputs = [nodejs_18.pkgs.yarn fixup_yarn_lock nodejs_18 copyDesktopItems makeWrapper]; nativeBuildInputs = [nodejs_20.pkgs.yarn fixup_yarn_lock nodejs_20 copyDesktopItems makeWrapper];
configurePhase = '' configurePhase = ''
runHook preConfigure runHook preConfigure
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
then "--arm64" then "--arm64"
else "--x64" else "--x64"
} \ } \
-c.electronDist=${electron}/lib/electron \ -c.electronDist=${electron}/libexec/electron \
-c.electronVersion=${electron.version} -c.electronVersion=${electron.version}
runHook postBuild runHook postBuild
@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
else "linux-" else "linux-"
}${lib.optionalString stdenv.hostPlatform.isAarch64 "arm64-"}unpacked/resources/app.asar $out/share/prospect-mail/ }${lib.optionalString stdenv.hostPlatform.isAarch64 "arm64-"}unpacked/resources/app.asar $out/share/prospect-mail/
pushd build/icons pushd build
for image in *png; do for image in *png; do
mkdir -p $out/share/icons/hicolor/''${image%.png}/apps mkdir -p $out/share/icons/hicolor/''${image%.png}/apps
cp -r $image $out/share/icons/hicolor/''${image%.png}/apps/prospect-mail.png cp -r $image $out/share/icons/hicolor/''${image%.png}/apps/prospect-mail.png