diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-18 00:02:06 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-18 00:02:06 +0000 |
commit | 08a8809bfe1688df8419f41fd31c2f794c4debdf (patch) | |
tree | 02c532b4ebeac226362c3723c8b9cfa1ef7e4c5c /pkgs/applications/misc/1password-gui/default.nix | |
parent | 11332e9137fbbab82b10312da9dad67e3607f553 (diff) | |
parent | 382fdc7ad3184c7d47f54feb535a970fe64a0f35 (diff) | |
download | nixpkgs-08a8809bfe1688df8419f41fd31c2f794c4debdf.tar nixpkgs-08a8809bfe1688df8419f41fd31c2f794c4debdf.tar.gz nixpkgs-08a8809bfe1688df8419f41fd31c2f794c4debdf.tar.bz2 nixpkgs-08a8809bfe1688df8419f41fd31c2f794c4debdf.tar.lz nixpkgs-08a8809bfe1688df8419f41fd31c2f794c4debdf.tar.xz nixpkgs-08a8809bfe1688df8419f41fd31c2f794c4debdf.tar.zst nixpkgs-08a8809bfe1688df8419f41fd31c2f794c4debdf.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/misc/1password-gui/default.nix')
-rw-r--r-- | pkgs/applications/misc/1password-gui/default.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index b4b55fa264d..0803b495b2f 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -28,15 +28,16 @@ , nss , pango , systemd +, udev , xdg-utils }: stdenv.mkDerivation rec { pname = "1password"; - version = "8.0.34"; + version = "8.1.1"; src = fetchurl { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; - sha256 = "0mp119v5vgsva7pnxpsbq4xhh4vbhwv7ga9b5b7f6slx3biy1wmh"; + sha256 = "0y39sfhj9xrgprh01i9apzfkqzm6pdhjc8x59x5p5djjjvxbcwmy"; }; nativeBuildInputs = [ makeWrapper ]; @@ -95,8 +96,12 @@ stdenv.mkDerivation rec { patchelf --set-rpath ${rpath}:$out/share/1password $file done + # Electron is trying to open udev via dlopen() + # and for some reason that doesn't seem to be impacted from the rpath. + # Adding udev to LD_LIBRARY_PATH fixes that. makeWrapper $out/share/1password/1password $out/bin/1password \ - --prefix PATH : ${xdg-utils}/bin + --prefix PATH : ${lib.makeBinPath [ xdg-utils ]} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]} runHook postInstall ''; |