insync: 3.8.5.50499 -> 3.8.6.50504
With fixes: - Top-level runner is now simply insync, in sync with vendor's desktopfile. - The /share folder including desktop files are now part of the top package. - use stdenvNoCC instead of stdenv.
This commit is contained in:
parent
4645ea3569
commit
00253158de
|
@ -1,7 +1,7 @@
|
||||||
{ lib
|
{ lib
|
||||||
, writeShellScript
|
, writeShellScript
|
||||||
, buildFHSEnv
|
, buildFHSEnv
|
||||||
, stdenv
|
, stdenvNoCC
|
||||||
, fetchurl
|
, fetchurl
|
||||||
, autoPatchelfHook
|
, autoPatchelfHook
|
||||||
, dpkg
|
, dpkg
|
||||||
|
@ -15,7 +15,7 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
pname = "insync";
|
pname = "insync";
|
||||||
version = "3.8.5.50499";
|
version = "3.8.6.50504";
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
platforms = ["x86_64-linux"];
|
platforms = ["x86_64-linux"];
|
||||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||||
|
@ -37,13 +37,14 @@ let
|
||||||
2) libqtvirtualkeyboardplugin does not have necessary Qt library shipped from vendor.
|
2) libqtvirtualkeyboardplugin does not have necessary Qt library shipped from vendor.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
insync-pkg = stdenv.mkDerivation {
|
|
||||||
inherit pname version;
|
insync-pkg = stdenvNoCC.mkDerivation {
|
||||||
|
inherit pname version meta;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
# Find a binary from https://www.insynchq.com/downloads/linux#ubuntu.
|
# Find a binary from https://www.insynchq.com/downloads/linux#ubuntu.
|
||||||
url = "https://cdn.insynchq.com/builds/linux/${pname}_${version}-lunar_amd64.deb";
|
url = "https://cdn.insynchq.com/builds/linux/${pname}_${version}-lunar_amd64.deb";
|
||||||
sha256 = "sha256-mpMJe8LAmO9OrqRIEWuxfVNeh5ANvjZIEHFz8cXYObY=";
|
sha256 = "sha256-BxTFtQ1rAsOuhKnH5vsl3zkM7WOd+vjA4LKZGxl4jk0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
@ -68,7 +69,7 @@ let
|
||||||
cp -R usr/* $out/
|
cp -R usr/* $out/
|
||||||
|
|
||||||
# use system glibc
|
# use system glibc
|
||||||
rm -f $out/lib/insync/{libgcc_s.so.1,libstdc++.so.6}
|
rm $out/lib/insync/{libgcc_s.so.1,libstdc++.so.6}
|
||||||
|
|
||||||
# remove badly packaged plugins
|
# remove badly packaged plugins
|
||||||
rm $out/lib/insync/PySide2/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so
|
rm $out/lib/insync/PySide2/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so
|
||||||
|
@ -76,35 +77,43 @@ let
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
dontConfigure = true;
|
|
||||||
dontBuild = true;
|
|
||||||
|
|
||||||
# NB! This did the trick, otherwise it segfaults! However I don't understand why!
|
# NB! This did the trick, otherwise it segfaults! However I don't understand why!
|
||||||
dontStrip = true;
|
dontStrip = true;
|
||||||
|
|
||||||
inherit meta;
|
|
||||||
};
|
};
|
||||||
in buildFHSEnv { # ref: pkgs/build-support/build-fhsenv-bubblewrap/default.nix
|
|
||||||
name = "${pname}-${version}";
|
|
||||||
inherit meta;
|
|
||||||
|
|
||||||
# for including insync's xdg data dirs
|
insync-fhsenv = buildFHSEnv {
|
||||||
extraOutputsToInstall = [ "share" ];
|
name = "${pname}-${version}";
|
||||||
|
inherit meta;
|
||||||
|
|
||||||
targetPkgs = pkgs: [
|
# for including insync's xdg data dirs
|
||||||
insync-pkg
|
extraOutputsToInstall = [ "share" ];
|
||||||
];
|
|
||||||
|
|
||||||
multiPkgs = pkgs: with pkgs; [
|
targetPkgs = pkgs: [
|
||||||
# apparently only package needed for the FHS :)
|
insync-pkg
|
||||||
libudev0-shim
|
];
|
||||||
];
|
|
||||||
|
|
||||||
runScript = writeShellScript "insync-wrapper.sh" ''
|
multiPkgs = pkgs: with pkgs; [
|
||||||
|
# apparently only package needed for the FHS :)
|
||||||
|
libudev0-shim
|
||||||
|
];
|
||||||
|
|
||||||
|
runScript = writeShellScript "insync-wrapper.sh" ''
|
||||||
# QT_STYLE_OVERRIDE was used to suppress a QT warning, it should have no actual effect for this binary.
|
# QT_STYLE_OVERRIDE was used to suppress a QT warning, it should have no actual effect for this binary.
|
||||||
export QT_STYLE_OVERRIDE=Fusion
|
export QT_STYLE_OVERRIDE=Fusion
|
||||||
exec "${insync-pkg.outPath}/lib/insync/insync" "$@"
|
exec "${insync-pkg.outPath}/lib/insync/insync" "$@"
|
||||||
|
'';
|
||||||
|
|
||||||
|
# "insync start" command starts a daemon.
|
||||||
|
dieWithParent = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
in stdenvNoCC.mkDerivation {
|
||||||
|
inherit pname version meta;
|
||||||
|
|
||||||
|
dontUnpack = true;
|
||||||
|
installPhase = ''
|
||||||
|
mkdir -p $out/bin
|
||||||
|
ln -s ${insync-fhsenv}/bin/${insync-fhsenv.name} $out/bin/insync
|
||||||
|
ln -s ${insync-pkg}/share $out/share
|
||||||
'';
|
'';
|
||||||
# "insync start" command starts a daemon.
|
|
||||||
dieWithParent = false;
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue