diff options
author | Daniƫl de Kok <me@danieldk.eu> | 2021-05-04 16:57:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-04 16:57:18 +0200 |
commit | b68211318a272f37589e9d0f5e7f550f72ec8fff (patch) | |
tree | da4ff74aa46962db5bae527f8f04ba861c0e64e2 /pkgs/applications/misc | |
parent | 94253a60ce1b4491ebe9eaf77271917969b48053 (diff) | |
parent | f5c9166536988eeb29ff2aaebeb9b6623642bc02 (diff) |
Merge pull request #121378 from danieldk/1password-tarball
_1password-gui: 8.0.30 -> 8.0.33-53.BETA
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/1password-gui/default.nix | 37 | ||||
-rwxr-xr-x | pkgs/applications/misc/1password-gui/update.sh | 2 |
2 files changed, 23 insertions, 16 deletions
diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 0b3e21cc03a05..9f062aa20fc0a 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl -, appimageTools , makeWrapper , electron_11 , openssl @@ -8,21 +8,15 @@ stdenv.mkDerivation rec { pname = "1password"; - version = "8.0.30"; + version = "8.0.33-53.BETA"; src = fetchurl { - url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage"; - hash = "sha256-j+fp/f8nta+OOuOFU4mmUrGYlVmAqdaXO4rLJ0in+m8="; + url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; + hash = "sha256-YUYER+UiM1QEDgGl0P9bIT65YVacUnuGtQVkV91teEU="; }; nativeBuildInputs = [ makeWrapper ]; - appimageContents = appimageTools.extractType2 { - name = "${pname}-${version}"; - inherit src; - }; - - dontUnpack = true; dontConfigure = true; dontBuild = true; @@ -35,20 +29,33 @@ stdenv.mkDerivation rec { mkdir -p $out/bin $out/share/1password # Applications files. - cp -a ${appimageContents}/{locales,resources} $out/share/${pname} + cp -a {locales,resources} $out/share/${pname} + install -Dm0755 -t $out/share/${pname} {1Password-BrowserSupport,1Password-KeyringHelper} # Desktop file. - install -Dt $out/share/applications ${appimageContents}/${pname}.desktop + install -Dt $out/share/applications resources/${pname}.desktop substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' + --replace 'Exec=/opt/1Password/${pname}' 'Exec=${pname}' # Icons. - cp -a ${appimageContents}/usr/share/icons $out/share + cp -a resources/icons $out/share # Wrap the application with Electron. makeWrapper "${electron_11}/bin/electron" "$out/bin/${pname}" \ --add-flags "$out/share/${pname}/resources/app.asar" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeLibs}" + + # Set the interpreter for the helper binaries and wrap them with + # the runtime libraries. + interp="$(cat $NIX_CC/nix-support/dynamic-linker)" + patchelf --set-interpreter $interp \ + $out/share/$pname/{1Password-BrowserSupport,1Password-KeyringHelper} + + wrapProgram $out/share/${pname}/1Password-BrowserSupport \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeLibs}" + + wrapProgram $out/share/${pname}/1Password-KeyringHelper \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeLibs}" ''; passthru.updateScript = ./update.sh; diff --git a/pkgs/applications/misc/1password-gui/update.sh b/pkgs/applications/misc/1password-gui/update.sh index 7703aba99847e..8ebdaca711731 100755 --- a/pkgs/applications/misc/1password-gui/update.sh +++ b/pkgs/applications/misc/1password-gui/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnused common-updater-scripts -version="$(curl -sL https://onepassword.s3.amazonaws.com/linux/debian/dists/edge/main/binary-amd64/Packages | sed -r -n 's/^Version: (.*)-[0-9]+/\1/p' | head -n1)" +version="$(curl -sL https://onepassword.s3.amazonaws.com/linux/debian/dists/edge/main/binary-amd64/Packages | sed -r -n 's/^Version: (.*)/\1/p' | head -n1)" update-source-version _1password-gui "$version" |