exozyme/packages
3
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

small changes & code refactoring

Browse source
This commit is contained in:
Johannes Schnürle 2022-06-03 19:12:57 +02:00
parent 5d7802607c
commit 0d9de871de
2 changed files with 33 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
guacamole-server/default.nix
View file

@ -9,9 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "J4kHXIsl5apC3sUFSR00Jbey/iBRdysABoYMJuile5A="; sha256 = "J4kHXIsl5apC3sUFSR00Jbey/iBRdysABoYMJuile5A=";
}; };
#required dependencies #required & optional dependencies
reqDeps = [cairo libjpeg libpng libtool libuuid]; reqDeps = [cairo libjpeg libpng libtool libuuid];
#optional dependencies
optDeps = [ffmpeg freerdp pango libssh2 libtelnet libvncserver libwebsockets pulseaudio openssl libvorbis libwebp]; optDeps = [ffmpeg freerdp pango libssh2 libtelnet libvncserver libwebsockets pulseaudio openssl libvorbis libwebp];
buildInputs = reqDeps ++ optDeps; buildInputs = reqDeps ++ optDeps;

6
woodpecker-server/default.nix
View file

@ -30,10 +30,10 @@ in buildGoModule rec {
inherit src; inherit src;
vendorSha256 = null; vendorSha256 = null;
subPackages = [ "cmd/server" ]; subPackages = [ "cmd/server" ];
buildInputs = [pkgs.glibc.static]; buildInputs = [glibc.static];
CGO_ENABLED = true; CGO_ENABLED = true;
cflags="-I${pkgs.glibc.dev}/include"; cflags="-I ${glibc.dev}/include";
ldflags = ["-s" "-w" ''-extldflags "-static"'' "-X github.com/woodpecker-ci/woodpecker/version.Version=${version}" "-L ${pkgs.glibc}/lib"]; ldflags = ["-s" "-w" ''-extldflags "-static"'' "-X github.com/woodpecker-ci/woodpecker/version.Version=${version}" "-L ${glibc}/lib"];
postPatch = '' postPatch = ''
cp -r ${frontend}/libexec/woodpecker-ci/deps/woodpecker-ci/dist web/dist cp -r ${frontend}/libexec/woodpecker-ci/deps/woodpecker-ci/dist web/dist
''; '';