element-{web,desktop}: move to pkgs/by-name, (773b01fb) · Commits · nix / nixpkgs

pkgs/applications/networking/instant-messengers/element/pin.nix→pkgs/by-name/el/element-desktop/element-desktop-pin.nix

+0 −2

Original line number	Diff line number	Diff line
		@@ -3,7 +3,5 @@
		"hashes" = {
		"desktopSrcHash" = "sha256-vZLM1AIMxDltB+GeQEcYifnaBC1+4wWkotPFuelHxT0=";
		"desktopYarnHash" = "1n057ic4dzcyg3wfr8jj7vab00jg2d1m38y5zk1kab1pka163f1q";
		"webSrcHash" = "sha256-ErhxNbe3uM97cmiOLtDeQwJT8RMWD2NKQ+q/VPU9+js=";
		"webYarnHash" = "1wma1d2z5b1lhlh0vbnp30255gn4hvjpczsprg3s4y30716gsm44";
		};
		}

+0 −0

File moved.

+0 −0

File moved.

+0 −0

File moved.

+5 −6

Original line number	Diff line number	Diff line
		@@ -13,9 +13,7 @@
		element-web,
		sqlcipher,
		callPackage,
		Security,
		AppKit,
		CoreServices,
		darwin,
		desktopToDarwinBundle,
		useKeytar ? true,
		# command line arguments which are always set
		@@ -23,11 +21,11 @@
		}:

		let
		pinData = import ./pin.nix;
		pinData = import ./element-desktop-pin.nix;
		inherit (pinData.hashes) desktopSrcHash desktopYarnHash;
		executableName = "element-desktop";
		keytar = callPackage ./keytar { inherit Security AppKit; };
		seshat = callPackage ./seshat { inherit CoreServices; };
		keytar = callPackage ./keytar { inherit (darwin.apple_sdk.frameworks) Security AppKit; };
		seshat = callPackage ./seshat { inherit (darwin.apple_sdk.frameworks) CoreServices; };
		electron = electron_33;
		in
		stdenv.mkDerivation (
		@@ -146,6 +144,7 @@ stdenv.mkDerivation (
		'';

		passthru = {
		# run with: nix-shell ./maintainers/scripts/update.nix --argstr package element-desktop
		updateScript = ./update.sh;

		# TL;DR: keytar is optional while seshat isn't.