mirrors/yandex-music-linux
0
0
Fork 0
mirror of https://github.com/cucumber-sp/yandex-music-linux.git synced 2024-12-23 22:22:59 +03:00
Code

Fix build with nix

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

Change-Id: I0408c30cb363efe58282ce6b1ac06acb83697abe
This commit is contained in:
Yury Shvedov 2024-03-10 10:05:11 +03:00
parent bbb291a209
commit 209f9f8fa3
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/build.yml vendored
View File

@ -33,7 +33,7 @@ jobs:
- name: Fix permissions for build - 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 . 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 - name: Make Arch package
run: sudo -u nobody makepkg --log && mv *.pkg.tar.zst dist/ run: sudo -u nobody makepkg --log && mv *.pkg.tar.zst dist/
@ -85,7 +85,6 @@ jobs:
path: ./dist/release_notes.json path: ./dist/release_notes.json
nix-build: nix-build:
if: false
runs-on: ubuntu-latest runs-on: ubuntu-latest
env: env:
NIXPKGS_ALLOW_UNFREE: 1 NIXPKGS_ALLOW_UNFREE: 1

7
repack.sh
View File

@ -14,13 +14,12 @@ usage() {
exe_location= exe_location=
dst="$PWD/app" dst="$PWD/app"
START_DIR="$PWD"
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
nopatch=0 nopatch=0
while getopts :xo:ph name; do while getopts :xo:ph name; do
case $name in case $name in
x) extract_only=1 ;; x) extract_only=1 ;;
o) dst="$OPTARG" ;; o) dst="$(realpath "$OPTARG")" ;;
p) nopatch=1 ;; p) nopatch=1 ;;
h) h)
usage usage
@ -85,7 +84,7 @@ done
echo "Title Fixed" echo "Title Fixed"
echo "Replacing Icons" echo "Replacing Icons"
cp -af "$SCRIPT_DIR/icons/." "./build/next-desktop/" cp -drf "$SCRIPT_DIR/icons/." "./build/next-desktop/"
echo "Replaced Icons" echo "Replaced Icons"
# applying patches # applying patches
@ -121,8 +120,6 @@ if [ "$nopatch" != "1" ]; then
done done
fi fi
cd "$START_DIR" # fix relative path when using -o flag
mkdir -p "$dst" mkdir -p "$dst"
if [ -n "$extract_only" ]; then if [ -n "$extract_only" ]; then