Upgrade gitkraken to 3.3.4

clean


clean

pkgs/applications/version-management/gitkraken/default.nix

@@ -1,6 +1,6 @@
 { stdenv, lib, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib
 , libXfixes, atk, gtk2, libXrender, pango, gnome2, cairo, freetype, fontconfig
-, libX11, libXi, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst
+, libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst
 , nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus
 , dpkg, makeDesktopItem
 }:
@@ -9,11 +9,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "gitkraken-${version}";
-  version = "2.7.0";
+  version = "3.3.4";
 
   src = fetchurl {
     url = "https://release.gitkraken.com/linux/v${version}.deb";
-    sha256 = "0088vdn47563f0v9zhk1vggn3c2cfg8rhmifc6nw4zbss49si5gp";
+    sha256 = "1djrbpm1f258cicf65ddvndpxi1izmnc12253k1zwl77z4jjbwls";
   };
 
   libPath = makeLibraryPath [
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
     libXext
     libXcursor
     libXi
+    libxcb
     glib
     libXScrnSaver
     libxkbfile
@@ -66,27 +67,25 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ dpkg ];
 
-  unpackPhase = "dpkg-deb -x $src .";
+  unpackPhase = "true";
+  buildCommand = ''
+    mkdir -p $out
+    dpkg -x $src $out
+    substituteInPlace $out/usr/share/applications/gitkraken.desktop \
+      --replace /usr/share/gitkraken $out/bin
+    cp -av $out/usr/* $out
+    rm -rf $out/etc $out/usr $out/share/lintian
+    chmod -R g-w $out
 
-  installPhase = ''
+    for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do
-    mkdir -p "$out/opt/gitkraken"
+      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true
-    cp -r usr/share/gitkraken/* "$out/opt/gitkraken"
+      patchelf --set-rpath ${libPath}:$out/share/gitkraken $file || true
+    done
 
-    mkdir -p "$out/share/applications"
+    find $out/share/gitkraken -name "*.node" -exec patchelf --set-rpath "${libPath}:$out/share/gitkraken" {} \;
-    cp $desktopItem/share/applications/* "$out/share/applications"
 
-    mkdir -p "$out/share/pixmaps"
+    rm $out/bin/gitkraken
-    cp usr/share/pixmaps/app.png "$out/share/pixmaps"
+    ln -s $out/share/gitkraken/gitkraken $out/bin/gitkraken
-  '';
-
-  postFixup = ''
-    patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-             --set-rpath "$libPath:$out/opt/gitkraken" "$out/opt/gitkraken/gitkraken"
-    wrapProgram $out/opt/gitkraken/gitkraken \
-      --prefix LD_PRELOAD : "${makeLibraryPath [ curl ]}/libcurl.so.4" \
-      --prefix LD_PRELOAD : "${makeLibraryPath [ libgnome-keyring ]}/libgnome-keyring.so.0"
-    mkdir "$out/bin"
-    ln -s "$out/opt/gitkraken/gitkraken" "$out/bin/gitkraken"
   '';
 
   meta = {