Merge pull request #107416 from hjones2199/phd2wrap

phd2: add GApps wrapper to fix breakage on non-nixos wayland systems
This commit is contained in:
Guillaume Girol 2021-01-05 20:09:24 +00:00 committed by GitHub
commit f3e84c4d42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkg-config, cmake, gtk3, { stdenv, fetchFromGitHub, pkg-config, cmake, gtk3, wxGTK30-gtk3,
wxGTK30-gtk3, curl, gettext, glib, indilib, libnova }: curl, gettext, glib, indilib, libnova, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "phd2"; pname = "phd2";
@ -12,13 +12,18 @@ stdenv.mkDerivation rec {
sha256 = "1ih7m9lilh12xbhmwm9kkicaqy72mi3firl6df7m5x38n2zj3zm4"; sha256 = "1ih7m9lilh12xbhmwm9kkicaqy72mi3firl6df7m5x38n2zj3zm4";
}; };
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ];
buildInputs = [ gtk3 wxGTK30-gtk3 curl gettext glib indilib libnova ]; buildInputs = [ gtk3 wxGTK30-gtk3 curl gettext glib indilib libnova ];
cmakeFlags = [ cmakeFlags = [
"-DOPENSOURCE_ONLY=1" "-DOPENSOURCE_ONLY=1"
]; ];
# Fix broken wrapped name scheme by moving wrapped binary to where wrapper expects it
postFixup = ''
mv $out/bin/.phd2.bin-wrapped $out/bin/.phd2-wrapped.bin
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://openphdguiding.org/"; homepage = "https://openphdguiding.org/";
description = "Telescope auto-guidance application"; description = "Telescope auto-guidance application";