Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

phoebus-client: hardcode Python path for the console view #120

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions pkgs/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,7 @@ in

pcas = callPackage ./epnix/tools/pcas {};

phoebus = callPackage ./epnix/tools/phoebus/client {
# TODO: uncomment when this works:
# TODO: add libjfxwebkit.so into openjfx
# jdk = final.openjdk17.override {enableJavaFX = true;};
};
phoebus = callPackage ./epnix/tools/phoebus/client {};
phoebus-alarm-server = callPackage ./epnix/tools/phoebus/alarm-server {};
phoebus-alarm-logger = callPackage ./epnix/tools/phoebus/alarm-logger {};
phoebus-archive-engine = callPackage ./epnix/tools/phoebus/archive-engine {};
Expand Down
28 changes: 22 additions & 6 deletions pkgs/epnix/tools/phoebus/client/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,29 @@
lib,
epnixLib,
stdenv,
substituteAll,
maven,
makeWrapper,
makeDesktopItem,
copyDesktopItems,
epnix,
jdk,
openjfx,
python3,
}: let
buildDate = "2022-02-24T07:56:00Z";
in
stdenv.mkDerivation {
pname = "phoebus";
inherit (epnix.phoebus-deps) version src;

patches = [
(substituteAll {
src = ./fix-python-path.patch;
python = lib.getExe python3;
})
];

# TODO: make a scope, so that we don't pass around the whole `epnix`
nativeBuildInputs = [
maven
Expand All @@ -32,21 +41,28 @@ in
})
];

# Put runtime dependencies in propagated
# because references get thrown into a jar
# which is compressed,
# so the Nix scanner won't always be able to see them
propagatedBuildInputs = [
python3
];

desktopItems = [
(makeDesktopItem {
name = "phoebus";
exec = "phoebus -server 4918 -resource %f";
desktopName = "Phoebus";
keywords = ["epics" "css"];
# https://specifications.freedesktop.org/menu-spec/menu-spec-1.0.html#category-registry
categories = [
# Main
"Office"
"Graphics"
"GUIDesigner"
"Viewer"
"Science"
"Physics"
"Monitor"

# Additional
"Java"
"Viewer"
];
})
];
Expand Down
17 changes: 17 additions & 0 deletions pkgs/epnix/tools/phoebus/client/fix-python-path.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
diff --git a/app/console/src/main/resources/console_preferences.properties b/app/console/src/main/resources/console_preferences.properties
index e00d6f8ec..e3bc52f3e 100644
--- a/app/console/src/main/resources/console_preferences.properties
+++ b/app/console/src/main/resources/console_preferences.properties
@@ -28,9 +28,9 @@ prompt_info=Enter console command
# /bin/bash
#
# Value may include properties.
-shell=/usr/bin/python -i
+shell=@python@ -i

# Folder where the shell process should be started
#
# Value may include properties.
-directory=$(user.home)
\ No newline at end of file
+directory=$(user.home)