From 1c10ce66c5a19c766f0da7a8ee43ea4b8d60662f Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Tue, 1 Sep 2020 17:20:39 +0200
Subject: [PATCH] 1password-gui: move required electron version to package
definition
---
pkgs/tools/security/1password-gui/default.nix | 7 ++++++-
pkgs/top-level/all-packages.nix | 4 +---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/pkgs/tools/security/1password-gui/default.nix b/pkgs/tools/security/1password-gui/default.nix
index 91052f945ed..b8ecf45c629 100644
--- a/pkgs/tools/security/1password-gui/default.nix
+++ b/pkgs/tools/security/1password-gui/default.nix
@@ -2,10 +2,15 @@
, fetchurl
, appimageTools
, makeWrapper
-, electron
+, electron_9
, openssl
}:
+let
+ electron = electron_9;
+
+in
+
stdenv.mkDerivation rec {
pname = "1password";
version = "0.8.4";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 50772641e74..e387d52e03a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -553,9 +553,7 @@ in
_1password = callPackage ../applications/misc/1password { };
- _1password-gui = callPackage ../tools/security/1password-gui {
- electron = electron_9;
- };
+ _1password-gui = callPackage ../tools/security/1password-gui { };
_6tunnel = callPackage ../tools/networking/6tunnel { };