Copy environment.fish only for system-resources package

YosysHQ · May 15, 2024 · a2963d2 · a2963d2
1 parent 1660fe1
commit a2963d2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/default/rules/resources-min.py b/default/rules/resources-min.py
@@ -3,6 +3,6 @@
 Target(
 	name = 'system-resources-min',
 	sources = [ ],
-	patches = [ 'fonts.conf.template', 'win-launcher.c', 'environment', 'environment.fish', 'environment.bat', 'start.bat', 'cacert.pem', 'tabbyadm' ],
+	patches = [ 'fonts.conf.template', 'win-launcher.c', 'environment', 'environment.bat', 'start.bat', 'cacert.pem', 'tabbyadm' ],
 	tools = {},
 )
diff --git a/default/rules/resources.py b/default/rules/resources.py
@@ -10,6 +10,6 @@
 Target(
 	name = 'system-resources-tabby',
 	sources = [ ],
-	patches = [ 'fonts.conf.template', 'win-launcher.c', 'environment', 'environment.fish', 'environment.bat', 'start.bat', 'cacert.pem', 'tabbyadm' ],
+	patches = [ 'fonts.conf.template', 'win-launcher.c', 'environment', 'environment.bat', 'start.bat', 'cacert.pem', 'tabbyadm' ],
 	tools = {},
 )
diff --git a/default/scripts/system-resources.sh b/default/scripts/system-resources.sh
@@ -1,6 +1,7 @@
 source ${WORK_DIR}/default/scripts/system-resources-tabby.sh
 
 if [ ${ARCH_BASE} == 'linux' ]; then
+    cp ${PATCHES_DIR}/environment.fish ${OUTPUT_DIR}${INSTALL_PREFIX}/.
     cp -rv /usr/lib/${CROSS_NAME}/libdl.so.2 ${OUTPUT_DIR}${INSTALL_PREFIX}/lib/.
     cp -rv /usr/lib/${CROSS_NAME}/libpthread.so.0 ${OUTPUT_DIR}${INSTALL_PREFIX}/lib/.
     cp -rL /usr/lib/${CROSS_NAME}/libGLX_*.so.0 ${OUTPUT_DIR}${INSTALL_PREFIX}/lib/.
@@ -77,3 +78,7 @@ if [ ${ARCH} == 'linux-arm64' ]; then
     popd
 fi
 fi
+
+if [ ${ARCH_BASE} == 'darwin' ]; then
+    cp ${PATCHES_DIR}/environment.fish ${OUTPUT_DIR}${INSTALL_PREFIX}/.
+fi