Skip to content

Commit

Permalink
chore: remove package-lock.json
Browse files Browse the repository at this point in the history
  • Loading branch information
lyonbot committed Sep 30, 2024
1 parent 0145783 commit 29d1677
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 2,562 deletions.
1 change: 0 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ jobs:
key: ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}
- name: Download deps
run: |
npm install -g typescript
brew install nasm
cargo install cargo-bundle
shell: bash
Expand Down
6 changes: 1 addition & 5 deletions Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ Weylus can make use of Nvidias NVENC as well as Microsoft's MediaFoundation for
video encoding. Due to widely varying quality it is disabled by default.

## Building
To build Weylus you need to install Rust, Typescript, make, git, a C compiler, nasm and bash. `cargo
To build Weylus you need to install Rust, NodeJS, make, git, a C compiler, nasm and bash. `cargo
build` builds the project. By default Weylus is build in debug mode, if you want a release build run
`cargo build --release`. On Linux some additional dependencies are required to build Weylus. On
Debian or Ubuntu they can be installed via:
Expand All @@ -278,10 +278,6 @@ libXfixes-devel libXtst-devel libXrandr-devel libXcomposite-devel libXi-devel li
pkg-config libdrm-devel pango-devel gstreamer1-devel \
gstreamer1-plugins-base-devel dbus-devel nasm npm
```
After npm is installed, typescript must be installed by:
```sh
sudo npm install typescript -g
```

Note that building for the first time may take a while as by default ffmpeg needs to be built. On
Windows only msvc is supported as C compiler; it is, however, possible to cross compile on Linux for
Expand Down
3 changes: 1 addition & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ RUN curl -LO "https://www.nasm.us/pub/nasm/releasebuilds/2.16.03/nasm-2.16.03.ta
tar xf "nasm-2.16.03.tar.xz" && cd "nasm-2.16.03" && \
./configure --prefix=/usr && make -j$(nproc) && make install && cd .. && rm -rf "nasm-2.16.03*"
RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - && \
apt-get install -y nodejs && \
npm install -g typescript
apt-get install -y nodejs
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | \
sh -s -- -y --default-toolchain stable-x86_64-unknown-linux-gnu
RUN cargo install cargo-deb
Expand Down
2 changes: 0 additions & 2 deletions docker/Dockerfile_alpine
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ RUN apk add --no-cache libx11-dev libxext-dev libxft-dev libxinerama-dev libxcur
autoconf libtool pkgconfig libdrm-dev pango-dev gst-plugins-base-dev gstreamer-dev dbus-libs \
dbus-dev cmake build-base nasm npm ffmpeg-dev libva-dev curl git bash automake tar

RUN npm install --global typescript

RUN ln -s /usr/bin/x86_64-alpine-linux-musl-gcc /usr/bin/musl-gcc
RUN ln -s /usr/bin/x86_64-alpine-linux-musl-g++ /usr/bin/musl-g++

Expand Down
Loading

0 comments on commit 29d1677

Please sign in to comment.