public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #40841 from marsam/feature/darwin-1password

Browse Source 
1password: 0.4 -> 0.4.1
This commit is contained in:
Pascal Wittmann 2018-05-22 18:02:06 +02:00 committed by GitHub
commit 88817735e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
pkgs/applications/misc/1password/default.nix
View File

@ -2,33 +2,46 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "1password-${version}"; name = "1password-${version}";
version = "0.4"; version = "0.4.1";
src = if stdenv.system == "i686-linux" then fetchzip { src =
url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip"; if stdenv.system == "i686-linux" then
sha256 = "0mhlqvd3az50gnfil0xlq10855v3bg7yb05j6ndg4h2c551jrq41"; fetchzip {
stripRoot = false; url = "https://cache.agilebits.com/dist/1P/op/pkg/v0.4.1/op_linux_386_v${version}.zip";
} else fetchzip { sha256 = "0mv2m6rm6bdpca8vhyx213bg4kh06jl2sx8q7mnrp22c3f0yzh7f";
url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; stripRoot = false;
sha256 = "15cv8xi4slid9jicdmc5xx2r9ag63wcx1mn7hcgzxbxbhyrvwhyf"; }
stripRoot = false; else if stdenv.system == "x86_64-linux" then
}; fetchzip {
url = "https://cache.agilebits.com/dist/1P/op/pkg/v0.4.1/op_linux_amd64_v${version}.zip";
sha256 = "016h5jcy6jic8j3mvlnpcig9jxs22vj71gh6rrap2q950bzi6fi1";
stripRoot = false;
}
else if stdenv.system == "x86_64-darwin" then
fetchzip {
url = "https://cache.agilebits.com/dist/1P/op/pkg/v0.4.1/op_darwin_amd64_v${version}.zip";
sha256 = "1l0bi0f6gd4q19wn3v409gj64wp51mr0xpb09da1fl33rl5fpszb";
stripRoot = false;
}
else throw "Architecture not supported";
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
installPhase = '' installPhase = ''
mkdir -p $out/bin install -D op $out/bin/op
install -D op $out/share/1password/op '';
postFixup = stdenv.lib.optionalString stdenv.isLinux ''
# https://github.com/NixOS/patchelf/issues/66#issuecomment-267743051 patchelf \
makeWrapper $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/op \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
--argv0 op \ $out/bin/op
--add-flags $out/share/1password/op
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "1Password command-line tool"; description = "1Password command-line tool";
homepage = "https://blog.agilebits.com/2017/09/06/announcing-the-1password-command-line-tool-public-beta/"; homepage = [
"https://blog.agilebits.com/2017/09/06/announcing-the-1password-command-line-tool-public-beta/"
"https://app-updates.agilebits.com/product_history/CLI"
];
maintainers = with maintainers; [ joelburget ]; maintainers = with maintainers; [ joelburget ];
license = licenses.unfree; license = licenses.unfree;
platforms = [ "i686-linux" "x86_64-linux" ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
}; };
} }