From 8838ea5d76a7701d4f6e3310e4f5b133aa347f28 Mon Sep 17 00:00:00 2001
From: Pete Peterson <petersonpf@ornl.gov>
Date: Wed, 7 Jan 2026 14:15:48 -0500
Subject: [PATCH 1/2] Update nr_launcher for pixi

---
 rpm/nsd-app-wrap.spec |  2 +-
 src/nr_launcher       | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 src/nr_launcher

diff --git a/rpm/nsd-app-wrap.spec b/rpm/nsd-app-wrap.spec
index c330d0d..ad3ef68 100644
--- a/rpm/nsd-app-wrap.spec
+++ b/rpm/nsd-app-wrap.spec
@@ -1,5 +1,5 @@
 Name:           nsd-app-wrap
-Version:        2.17
+Version:        2.18
 Release:        1%{?dist}
 Summary:        Wrapper scripts to launch python applications installed via anaconda
 Vendor:         Peter F. Peterson
diff --git a/src/nr_launcher b/src/nr_launcher
old mode 100644
new mode 100755
index a5fabf3..15785c9
--- a/src/nr_launcher
+++ b/src/nr_launcher
@@ -1,2 +1,12 @@
 #!/bin/bash
-cd /SNS/REF_L/shared/launcher; python launcher.py
+
+# import library to do the real work
+# shellcheck disable=SC1091
+. "$(dirname "$(realpath "$0")")/nsd-app-wrap.sh" \
+  || . /bin/nsd-app-wrap.sh
+
+
+# put together arguments - conda_env, application, argv
+args=("refl1d" "python /SNS/REF_L/shared/launcher/launcher.py" "$@")
+# launch the tool
+pixi_launch "${args[@]}"
-- 
GitLab


From a2228bc96fbfa67ae17b4fc67489c1b94a762f13 Mon Sep 17 00:00:00 2001
From: Pete Peterson <petersonpf@ornl.gov>
Date: Wed, 7 Jan 2026 14:17:56 -0500
Subject: [PATCH 2/2] Install nexpy script

---
 rpm/nsd-app-wrap.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rpm/nsd-app-wrap.spec b/rpm/nsd-app-wrap.spec
index ad3ef68..0fdc299 100644
--- a/rpm/nsd-app-wrap.spec
+++ b/rpm/nsd-app-wrap.spec
@@ -42,6 +42,7 @@ install -m 755 mantidpython                           %{buildroot}%{_bindir}/
 install -m 755 mantidworkbench                        %{buildroot}%{_bindir}/
 install -m 755 mantidtotalscattering                  %{buildroot}%{_bindir}/
 install -m 755 mcstas                                 %{buildroot}%{_bindir}/
+install -m 755 nexpy                                  %{buildroot}%{_bindir}/
 # not used right now - things that look like scriptlets cannot be in comments
 #install -m 755 neutron-imaging                        {buildroot}{_bindir}/
 install -m 755 nr_launcher                            %{buildroot}%{_bindir}/
-- 
GitLab