diff options
| author | Clément DOUIN <clement.douin@posteo.net> | 2024-04-17 10:32:40 +0200 |
|---|---|---|
| committer | Clément DOUIN <clement.douin@posteo.net> | 2024-04-18 08:41:06 +0200 |
| commit | 36fbcec3e0323a9a29e7a9a226a9cfdcee4ab614 (patch) | |
| tree | 046c02132899a46d9ae54212efab4399e48a0504 /pkgs | |
| parent | 26c7dc31d209e10f9e9f0e724ce3a349be9a0160 (diff) | |
himalaya: 1.0.0-beta.3 -> 1.0.0-beta.4
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/by-name/hi/himalaya/package.nix (renamed from pkgs/applications/networking/mailreaders/himalaya/default.nix) | 22 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 14 insertions, 12 deletions
diff --git a/pkgs/applications/networking/mailreaders/himalaya/default.nix b/pkgs/by-name/hi/himalaya/package.nix index 7ab696685b52e..607bb775f8fff 100644 --- a/pkgs/applications/networking/mailreaders/himalaya/default.nix +++ b/pkgs/by-name/hi/himalaya/package.nix @@ -3,9 +3,7 @@ , fetchFromGitHub , stdenv , pkg-config -, AppKit -, Cocoa -, Security +, darwin , installShellFiles , installShellCompletions ? stdenv.hostPlatform == stdenv.buildPlatform , installManPages ? stdenv.hostPlatform == stdenv.buildPlatform @@ -16,26 +14,34 @@ }: rustPlatform.buildRustPackage rec { + # Learn more about available cargo features at: + # - <https://pimalaya.org/himalaya/cli/latest/installation.html#cargo> inherit buildNoDefaultFeatures buildFeatures; pname = "himalaya"; - version = "1.0.0-beta.3"; + version = "1.0.0-beta.4"; src = fetchFromGitHub { owner = "soywod"; repo = pname; rev = "v${version}"; - hash = "sha256-B7eswDq4tKyg881i3pLd6h+HsObK0c2dQnYuvPAGJHk="; + hash = "sha256-NrWBg0sjaz/uLsNs8/T4MkUgHOUvAWRix1O5usKsw6o="; }; - cargoSha256 = "jOzuCXsrtXp8dmJTBqrEq4nog6smEPbdsFAy+ruPtY8="; + cargoSha256 = "YS8IamapvmdrOPptQh2Ef9Yold0IK1XIeGs0kDIQ5b8="; - nativeBuildInputs = [ ] + NIX_LDFLAGS = lib.optionals stdenv.isDarwin [ + "-F${darwin.apple_sdk.frameworks.AppKit}/Library/Frameworks" + "-framework" + "AppKit" + ]; + + nativeBuildInputs = [ pkg-config ] ++ lib.optional (builtins.elem "pgp-gpg" buildFeatures) pkg-config ++ lib.optional (installManPages || installShellCompletions) installShellFiles; buildInputs = [ ] - ++ lib.optionals stdenv.isDarwin [ AppKit Cocoa Security ] + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Cocoa Security ]) ++ lib.optional (builtins.elem "notmuch" buildFeatures) notmuch ++ lib.optional (builtins.elem "pgp-gpg" buildFeatures) gpgme; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45ac70caa80e0..be9edcff3dd11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31752,10 +31752,6 @@ with pkgs; hexedit = callPackage ../applications/editors/hexedit { }; - himalaya = callPackage ../applications/networking/mailreaders/himalaya { - inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Security; - }; - hydrogen-web-unwrapped = callPackage ../applications/networking/instant-messengers/hydrogen-web/unwrapped.nix { }; hydrogen-web = callPackage ../applications/networking/instant-messengers/hydrogen-web/wrapper.nix { |