diff options
author | Pavol Rusnak <pavol@rusnak.io> | 2021-11-03 20:37:50 +0100 |
---|---|---|
committer | Pavol Rusnak <pavol@rusnak.io> | 2021-11-03 21:52:38 +0100 |
commit | 942fe94bc3c871713977690413aac26c5c42ebe0 (patch) | |
tree | 9c1ec3fb49a4372686d16dfe5d495c143f478ce7 /pkgs/tools/security/bitwarden | |
parent | 7208ebc030754372f155f21f58e14a6d4ae9c3ee (diff) |
bitwarden: 1.28.1 -> 1.29.1
Diffstat (limited to 'pkgs/tools/security/bitwarden')
-rw-r--r-- | pkgs/tools/security/bitwarden/default.nix | 106 |
1 files changed, 45 insertions, 61 deletions
diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index 7d7afa624931e..050621cd20ef8 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -4,6 +4,7 @@ , fetchurl , lib , libsecret +, libxshmfence , makeDesktopItem , makeWrapper , stdenv @@ -11,78 +12,61 @@ , wrapGAppsHook }: -let - inherit (stdenv.hostPlatform) system; - +stdenv.mkDerivation rec { pname = "bitwarden"; + version = "1.29.1"; - version = { - x86_64-linux = "1.28.1"; - }.${system} or ""; - - sha256 = { - x86_64-linux = "sha256-vyEbISZDTN+CHqSEtElzfg4M4i+2RjUux5vzwJw8/dc="; - }.${system} or ""; - - meta = with lib; { - description = "A secure and free password manager for all of your devices"; - homepage = "https://bitwarden.com"; - license = licenses.gpl3; - maintainers = with maintainers; [ kiwi ]; - platforms = [ "x86_64-linux" ]; + src = fetchurl { + url = "https://github.com/bitwarden/desktop/releases/download/v${version}/Bitwarden-${version}-amd64.deb"; + sha256 = "0rxy19bazi7a6m2bpx6wadg5d9p0k324h369vgr5ppmxb69d6zp8"; }; - linux = stdenv.mkDerivation rec { - inherit pname version meta; - - src = fetchurl { - url = "https://github.com/bitwarden/desktop/releases/download/" - + "v${version}/Bitwarden-${version}-amd64.deb"; - inherit sha256; - }; + desktopItem = makeDesktopItem { + name = "bitwarden"; + exec = "bitwarden %U"; + icon = "bitwarden"; + comment = "A secure and free password manager for all of your devices"; + desktopName = "Bitwarden"; + categories = "Utility"; + }; - desktopItem = makeDesktopItem { - name = "bitwarden"; - exec = "bitwarden %U"; - icon = "bitwarden"; - comment = "A secure and free password manager for all of your devices"; - desktopName = "Bitwarden"; - categories = "Utility"; - }; + dontBuild = true; + dontConfigure = true; + dontPatchELF = true; + dontWrapGApps = true; - dontBuild = true; - dontConfigure = true; - dontPatchELF = true; - dontWrapGApps = true; + nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook wrapGAppsHook ]; - buildInputs = [ libsecret ] ++ atomEnv.packages; + buildInputs = [ libsecret libxshmfence ] ++ atomEnv.packages; - nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook wrapGAppsHook ]; + unpackPhase = "dpkg-deb -x $src ."; - unpackPhase = "dpkg-deb -x $src ."; + installPhase = '' + mkdir -p "$out/bin" + cp -R "opt" "$out" + cp -R "usr/share" "$out/share" + chmod -R g-w "$out" - installPhase = '' - mkdir -p "$out/bin" - cp -R "opt" "$out" - cp -R "usr/share" "$out/share" - chmod -R g-w "$out" + # Desktop file + mkdir -p "$out/share/applications" + cp "${desktopItem}/share/applications/"* "$out/share/applications" + ''; - # Desktop file - mkdir -p "$out/share/applications" - cp "${desktopItem}/share/applications/"* "$out/share/applications" - ''; + runtimeDependencies = [ + (lib.getLib udev) + ]; - runtimeDependencies = [ - (lib.getLib udev) - ]; + postFixup = '' + makeWrapper $out/opt/Bitwarden/bitwarden $out/bin/bitwarden \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libsecret stdenv.cc.cc ] }" \ + "''${gappsWrapperArgs[@]}" + ''; - postFixup = '' - makeWrapper $out/opt/Bitwarden/bitwarden $out/bin/bitwarden \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libsecret stdenv.cc.cc ] }" \ - "''${gappsWrapperArgs[@]}" - ''; + meta = with lib; { + description = "A secure and free password manager for all of your devices"; + homepage = "https://bitwarden.com"; + license = licenses.gpl3; + maintainers = with maintainers; [ kiwi ]; + platforms = [ "x86_64-linux" ]; }; - -in if stdenv.isDarwin -then throw "Bitwarden has not been packaged for macOS yet" -else linux +} |