diff options
author | Benjamin Hipple <bhipple@protonmail.com> | 2020-04-12 11:15:12 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-12 11:15:12 -0400 |
commit | d4dea954c8e8940efc17e26705fcdbaf6fc8b37d (patch) | |
tree | 897408dc96d0c81c081eaddfa200379a8e28eeb4 /pkgs/applications/misc | |
parent | 397e354931da4e01fd740f41f2463fa5cdf57f2e (diff) | |
parent | 1b39c60fcd9e5967b7277f40b566ea2e9171c3bf (diff) | |
download | nixlib-d4dea954c8e8940efc17e26705fcdbaf6fc8b37d.tar nixlib-d4dea954c8e8940efc17e26705fcdbaf6fc8b37d.tar.gz nixlib-d4dea954c8e8940efc17e26705fcdbaf6fc8b37d.tar.bz2 nixlib-d4dea954c8e8940efc17e26705fcdbaf6fc8b37d.tar.lz nixlib-d4dea954c8e8940efc17e26705fcdbaf6fc8b37d.tar.xz nixlib-d4dea954c8e8940efc17e26705fcdbaf6fc8b37d.tar.zst nixlib-d4dea954c8e8940efc17e26705fcdbaf6fc8b37d.zip |
Merge pull request #85077 from IvarWithoutBones/1password
1password: 0.7.0 -> 0.9.4
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/1password/default.nix | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 5f6118ef2fc9..b27569a8a30c 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -1,37 +1,40 @@ -{ stdenv, fetchzip }: +{ stdenv, fetchzip, autoPatchelfHook, fetchurl, xar, cpio }: stdenv.mkDerivation rec { pname = "1password"; - version = "0.7.0"; + version = "0.9.4"; src = if stdenv.hostPlatform.system == "i686-linux" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip"; - sha256 = "1lhp0ws543855rvpvh84rjvyi471259lg618cciqj8j6k04ls1g0"; + sha256 = "0hgvcm42035fs2qhhvycppcrqgya98rmkk347j3hyj1m6kqxi99c"; stripRoot = false; } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; - sha256 = "1sjv5qrc80fk9yz0cn2yj0cdm47ab3ch8n9hzj9hv9d64gjv4w8n"; + sha256 = "1fvl078kgpvzjr3jfp8zbajzsiwrcm33b7lqksxgcy30paqw6737"; stripRoot = false; } else if stdenv.hostPlatform.system == "x86_64-darwin" then - fetchzip { - url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.zip"; - sha256 = "1hnixmq7mrc6ky79k3s61vv89v4qhkm31kyni3rscibfrab0r8ir"; - stripRoot = false; + fetchurl { + url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.pkg"; + sha256 = "0fzbfxsgf0s93kg647zla9n9k5adnfb57dcwwnibs6lq5k63h8mj"; } else throw "Architecture not supported"; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ xar cpio ]; + + unpackPhase = stdenv.lib.optionalString stdenv.isDarwin '' + xar -xf $src + zcat Payload | cpio -i + ''; + installPhase = '' install -D op $out/bin/op ''; - postFixup = stdenv.lib.optionalString stdenv.isLinux '' - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - $out/bin/op - ''; + + nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ autoPatchelfHook ]; meta = with stdenv.lib; { description = "1Password command-line tool"; |