diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-07 03:41:24 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-07 03:41:24 +0200 |
| commit | 4c6c919a3141b14c3e90607f171e534a82eceeb0 (patch) | |
| tree | 9ea646e0f14fa84fa38a545a4edc33926208db96 /pkgs/tools/security/keybase-gui/default.nix | |
| parent | 335ae386741f74c63cf3bf4b7022a1e5e5f26066 (diff) | |
| parent | fc1224d55dfdde0a3e43635fc9465cdff0bb80a3 (diff) | |
| download | nixlib-4c6c919a3141b14c3e90607f171e534a82eceeb0.tar nixlib-4c6c919a3141b14c3e90607f171e534a82eceeb0.tar.gz nixlib-4c6c919a3141b14c3e90607f171e534a82eceeb0.tar.bz2 nixlib-4c6c919a3141b14c3e90607f171e534a82eceeb0.tar.lz nixlib-4c6c919a3141b14c3e90607f171e534a82eceeb0.tar.xz nixlib-4c6c919a3141b14c3e90607f171e534a82eceeb0.tar.zst nixlib-4c6c919a3141b14c3e90607f171e534a82eceeb0.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts: pkgs/os-specific/linux/kernel/generic.nix
Diffstat (limited to 'pkgs/tools/security/keybase-gui/default.nix')
| -rw-r--r-- | pkgs/tools/security/keybase-gui/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/tools/security/keybase-gui/default.nix b/pkgs/tools/security/keybase-gui/default.nix index ce98740e89bd..b0db3eea5b9e 100644 --- a/pkgs/tools/security/keybase-gui/default.nix +++ b/pkgs/tools/security/keybase-gui/default.nix @@ -37,10 +37,10 @@ let in stdenv.mkDerivation rec { name = "keybase-gui-${version}"; - version = "1.0.33-20171003193427.d9ceb86ac"; + version = "1.0.40-20180127033950.76a4b90c9"; src = fetchurl { url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version}_amd64.deb"; - sha256 = "0sqani2fy5jzqmz35md1bdw2vwpx91l87b6s3x9z53halzq7vfy6"; + sha256 = "1pskmwif5nx32d53kz8vbijv61i50kpjwyy53a37rz5nx3hgj3ar"; }; phases = ["unpackPhase" "installPhase" "fixupPhase"]; unpackPhase = '' @@ -48,7 +48,8 @@ stdenv.mkDerivation rec { tar xf data.tar.xz ''; installPhase = '' - mkdir -p $out/{bin,share} + mkdir -p $out/bin + mv usr/share $out/share mv opt/keybase $out/share/ cat > $out/bin/keybase-gui <<EOF @@ -78,6 +79,9 @@ stdenv.mkDerivation rec { exec $out/share/keybase/Keybase "\$@" EOF chmod +x $out/bin/keybase-gui + + substituteInPlace $out/share/applications/keybase.desktop \ + --replace run_keybase $out/bin/keybase-gui ''; postFixup = '' patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath "${libPath}:\$ORIGIN" "$out/share/keybase/Keybase" |