@@ -1,15 +1,15 @@
11{ stdenv, makeDesktopItem, fetchurl, unzip
22, gdk_pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome3
3−, xorg, mozjpeg, makeWrapper, gsettings-desktop-schemas
3+, xorg, mozjpeg, makeWrapper, wrapGAppsHook, hicolor-icon-theme, libuuid
44}:
55
66stdenv.mkDerivation rec {
77 name = "avocode-${version}";
8− version = "3.6.2";
8+ version = "3.6.12";
99
1010 src = fetchurl {
1111 url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
12− sha256 = "1slxxr3j0djqdnbk645sriwl99jp9imndyxiwd8aqggmmlp145a2";
12+ sha256 = "1qsxwqnkqfp4b9sgmhlv6wjl4mirhnx4bjj2vaq8iyz94pz637c8";
1313 };
1414
1515 libPath = stdenv.lib.makeLibraryPath (with xorg; [
@@ -42,6 +42,7 @@ stdenv.mkDerivation rec {
4242 libXrender
4343 libXtst
4444 libXScrnSaver
45+ libuuid
4546 ]);
4647
4748 desktopItem = makeDesktopItem {
@@ -54,8 +55,8 @@ stdenv.mkDerivation rec {
5455 comment = "The bridge between designers and developers";
5556 };
5657
57− nativeBuildInputs = [makeWrapper];
58− buildInputs = [ unzip gtk3 gsettings-desktop-schemas];
58+ nativeBuildInputs = [makeWrapper wrapGAppsHook];
59+ buildInputs = [ unzip gtk3 gnome3.adwaita-icon-theme hicolor-icon-theme ];
5960
6061 # src is producing multiple folder on unzip so we must
6162 # override unpackCmd to extract it into newly created folder
@@ -84,11 +85,7 @@ stdenv.mkDerivation rec {
8485 postFixup = ''
8586 patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/avocode
8687 for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do
87− patchelf --set-rpath ${libPath}:$out/ $file
88− done
89− for file in $out/bin/*; do
90− wrapProgram $file \
91− --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
88+ patchelf --set-rpath ${libPath}:$out/ $file || true
9289 done
9390 '';
9491