mirror of
https://github.com/cucumber-sp/yandex-music-linux.git
synced 2024-12-23 14:12:59 +03:00
Fix build with nix
* Do not remember current pwd - just use realpath * Do not preserve modes while copying icons Change-Id: I0408c30cb363efe58282ce6b1ac06acb83697abe
This commit is contained in:
parent
bbb291a209
commit
209f9f8fa3
3
.github/workflows/build.yml
vendored
3
.github/workflows/build.yml
vendored
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user