git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #107416 from hjones2199/phd2wrap

phd2: add GApps wrapper to fix breakage on non-nixos wayland systems

commitf3e84c4d422381fa8f119693bbb289ce79c542fb authorGuillaume Girol <symphorien@users.noreply.github.com> dateTue 5 Jan 2021, 20:09 (6 years ago) parentf35bf8ebc28967
1 file changed+8−3
pkgs/applications/science/astronomy/phd2/default.nix+8−3
pkgs/applications/science/astronomy/phd2/default.nix+8−3
@@ -1,5 +1,5 @@
1−{ stdenv, fetchFromGitHub, pkg-config, cmake, gtk3,
2− wxGTK30-gtk3, curl, gettext, glib, indilib, libnova }:
1+{ stdenv, fetchFromGitHub, pkg-config, cmake, gtk3, wxGTK30-gtk3,
2+ curl, gettext, glib, indilib, libnova, wrapGAppsHook }:
33
44stdenv.mkDerivation rec {
55 pname = "phd2";
@@ -12,13 +12,18 @@ stdenv.mkDerivation rec {
1212 sha256 = "1ih7m9lilh12xbhmwm9kkicaqy72mi3firl6df7m5x38n2zj3zm4";
1313 };
1414
15− nativeBuildInputs = [ cmake pkg-config ];
15+ nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ];
1616 buildInputs = [ gtk3 wxGTK30-gtk3 curl gettext glib indilib libnova ];
1717
1818 cmakeFlags = [
1919 "-DOPENSOURCE_ONLY=1"
2020 ];
2121
22+ # Fix broken wrapped name scheme by moving wrapped binary to where wrapper expects it
23+ postFixup = ''
24+ mv $out/bin/.phd2.bin-wrapped $out/bin/.phd2-wrapped.bin
25+ '';
26+
2227 meta = with stdenv.lib; {
2328 homepage = "https://openphdguiding.org/";
2429 description = "Telescope auto-guidance application";