Unverified Commit b0f45b48 authored by maxine's avatar maxine Committed by GitHub
Browse files

Merge pull request #295926 from savannidgerinel/savanni/1password-8.10.28-21 

_1password-gui_beta: 8.10.28-11 -> 8.10.28-21 + refactor
parents 857c76e0 61b6a6ae

nixos/modules/programs/_1password-gui.nix

+0 −8
Original line number Diff line number Diff line
@@ -51,14 +51,6 @@ in 
          setuid = false;

          setgid = true;

        };



        "1Password-KeyringHelper" = {

          source = "${package}/share/1password/1Password-KeyringHelper";

          owner = "root";

          group = "onepassword";

          setuid = true;

          setgid = true;

        };

      };



    };

pkgs/applications/misc/1password-gui/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
let



  pname = "1password";

  version = if channel == "stable" then "8.10.27" else "8.10.28-11.BETA";

  version = if channel == "stable" then "8.10.27" else "8.10.28-21.BETA";



  sources = {

    stable = {
@@ -33,19 +33,19 @@ let 
    beta = {

      x86_64-linux = {

        url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz";

        hash = "sha256-pchfBeZcXoyfSHutQqgAWkf6uzTEIQ/AbKDOC2N+BN8=";

        hash = "sha256-Pz9tpGsKLmf37r0fnBxcE7qGjN3RZSF/iwQUnqev0Jk=";

      };

      aarch64-linux = {

        url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz";

        hash = "sha256-rcjoyuEL8p4nCvjboPF0BV1lV5/+zo/rP9AP0ORB0N0=";

        hash = "sha256-ezzdwUUcSBqJUKlG1By5HXbgrTFDpaGIJipU+V1FUBc=";

      };

      x86_64-darwin = {

        url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";

        hash = "sha256-D3kYUpL69HMQnjJyzQ2/Ahiyt94uwxM86n7U9uQ/mVs=";

        hash = "sha256-zFO8ypDqPGcJY/2eKke/ljQ4S3syI7jyZSexbYzBA+c=";

      };

      aarch64-darwin = {

        url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";

        hash = "sha256-FJbFsMS/f7PHTvu9PxDgFQB3v47AsyESdKctr+S1LXk=";

        hash = "sha256-LAhGmXqfcgjiDbE0RLhzpi15rluM8/fZ3GZ52yHdMKg=";

      };

    };

  };

pkgs/applications/misc/1password-gui/linux.nix

+2 −2
Original line number Diff line number Diff line
@@ -110,8 +110,8 @@ in stdenv.mkDerivation { 
      cp -a resources/icons $out/share



      interp="$(cat $NIX_CC/nix-support/dynamic-linker)"

      patchelf --set-interpreter $interp $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper,1Password-LastPass-Exporter,op-ssh-sign}

      patchelf --set-rpath ${rpath}:$out/share/1password $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper,1Password-LastPass-Exporter,op-ssh-sign}

      patchelf --set-interpreter $interp $out/share/1password/{1password,1Password-BrowserSupport,1Password-LastPass-Exporter,op-ssh-sign}

      patchelf --set-rpath ${rpath}:$out/share/1password $out/share/1password/{1password,1Password-BrowserSupport,1Password-LastPass-Exporter,op-ssh-sign}

      for file in $(find $out -type f -name \*.so\* ); do

        patchelf --set-rpath ${rpath}:$out/share/1password $file

      done