From 209f9f8fa35cfd31785a98c091591856f9e75802 Mon Sep 17 00:00:00 2001
From: Yury Shvedov <yury.shvedov@kaspersky.com>
Date: Sun, 10 Mar 2024 10:05:11 +0300
Subject: [PATCH] Fix build with nix

* Do not remember current pwd - just use realpath
* Do not preserve modes while copying icons

Change-Id: I0408c30cb363efe58282ce6b1ac06acb83697abe
---
 .github/workflows/build.yml | 3 +--
 repack.sh                   | 7 ++-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 008ebb5..e286be9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -33,7 +33,7 @@ jobs:
 
       - name: Fix permissions for build
         run: mkdir /home/build && chgrp nobody /home/build && chmod g+ws /home/build && setfacl -m u::rwx,g::rwx /home/build && setfacl -d --set u::rwx,g::rwx,o::- /home/build && chown nobody .
-        
+
       - name: Make Arch package
         run: sudo -u nobody makepkg --log && mv *.pkg.tar.zst dist/
 
@@ -85,7 +85,6 @@ jobs:
           path: ./dist/release_notes.json
 
   nix-build:
-    if: false
     runs-on: ubuntu-latest
     env:
       NIXPKGS_ALLOW_UNFREE: 1
diff --git a/repack.sh b/repack.sh
index 025dcd7..7ce5e27 100755
--- a/repack.sh
+++ b/repack.sh
@@ -14,13 +14,12 @@ usage() {
 
 exe_location=
 dst="$PWD/app"
-START_DIR="$PWD"
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 nopatch=0
 while getopts :xo:ph name; do
     case $name in
     x) extract_only=1 ;;
-    o) dst="$OPTARG" ;;
+    o) dst="$(realpath "$OPTARG")" ;;
     p) nopatch=1 ;;
     h)
         usage
@@ -85,7 +84,7 @@ done
 echo "Title Fixed"
 
 echo "Replacing Icons"
-cp -af "$SCRIPT_DIR/icons/." "./build/next-desktop/"
+cp -drf "$SCRIPT_DIR/icons/." "./build/next-desktop/"
 echo "Replaced Icons"
 
 # applying patches
@@ -121,8 +120,6 @@ if [ "$nopatch" != "1" ]; then
     done
 fi
 
-cd "$START_DIR" # fix relative path when using -o flag
-
 mkdir -p "$dst"
 
 if [ -n "$extract_only" ]; then