Merge pull request #49222 from plumelo/feature/avocode-3.6.2

avocode: 3.4.0 -> 3.6.2
This commit is contained in:
Jörg Thalheim 2018-10-29 00:42:51 +00:00 committed by GitHub
commit 56d2af6e98
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,23 +1,24 @@
{ stdenv, makeDesktopItem, fetchurl, unzip
, gdk_pixbuf, glib, gtk2, atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome2
, xorg, mozjpeg
, gdk_pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome3
, xorg, mozjpeg, makeWrapper, gsettings-desktop-schemas
}:
stdenv.mkDerivation rec {
name = "avocode-${version}";
version = "3.4.0";
version = "3.6.2";
src = fetchurl {
url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
sha256 = "1dk4vgam9r5nl8dvpfwrn52gq6r4zxs4zz63p3c4gk73d8qnh4dl";
sha256 = "1slxxr3j0djqdnbk645sriwl99jp9imndyxiwd8aqggmmlp145a2";
};
libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome2; [
libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome3; [
stdenv.cc.cc.lib
gdk_pixbuf
glib
gtk2
gtk3
atk
at-spi2-atk
pango
cairo
freetype
@ -29,7 +30,6 @@ stdenv.mkDerivation rec {
cups
expat
udev
GConf
libX11
libxcb
libXi
@ -54,7 +54,8 @@ stdenv.mkDerivation rec {
comment = "The bridge between designers and developers";
};
buildInputs = [ unzip ];
nativeBuildInputs = [makeWrapper];
buildInputs = [ unzip gtk3 gsettings-desktop-schemas];
# src is producing multiple folder on unzip so we must
# override unpackCmd to extract it into newly created folder
@ -85,6 +86,10 @@ stdenv.mkDerivation rec {
for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do
patchelf --set-rpath ${libPath}:$out/ $file
done
for file in $out/bin/*; do
wrapProgram $file \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
done
'';
enableParallelBuilding = true;