exozyme/packages
6
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

5
guacamole-server/default.nix
View file

@ -5,13 +5,12 @@ stdenv.mkDerivation rec {
version = "1.4.0"; version = "1.4.0";
src = fetchurl { src = fetchurl {
url = "https://apache.org/dyn/closer.lua/guacamole/1.4.0/source/guacamole-server-1.4.0.tar.gz?action=download"; url = "https://apache.org/dyn/closer.lua/guacamole/1.4.0/source/guacamole-server-1.4.0.tar.gz?action=download";
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;

62
woodpecker-server/default.nix
View file

@ -1,40 +1,40 @@
with import <nixpkgs> {}; with import <nixpkgs> {};
let let
version = "0.15.1"; version = "0.15.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "woodpecker-ci"; owner = "woodpecker-ci";
repo = "woodpecker"; repo = "woodpecker";
rev = "v${version}"; rev = "v${version}";
sha256 = "ilywzKczcER7kO19X6vhn28HieeT7ZTSsoKyu802bS0="; sha256 = "ilywzKczcER7kO19X6vhn28HieeT7ZTSsoKyu802bS0=";
}; };
frontend = mkYarnPackage { frontend = mkYarnPackage {
pname = "woodpecker-frontend"; pname = "woodpecker-frontend";
inherit version; inherit version;
src = "${src}/web"; src = "${src}/web";
packageJSON = "${src}/web/package.json"; packageJSON = "${src}/web/package.json";
yarnLock = "${src}/web/yarn.lock"; yarnLock = "${src}/web/yarn.lock";
buildPhase = '' buildPhase = ''
yarn build yarn build
''; '';
distPhase = "true"; distPhase = "true";
}; };
meta = with lib; { meta = with lib; {
description = "Woodpecker is a community fork of the Drone CI system."; description = "Woodpecker is a community fork of the Drone CI system.";
homepage = "https://woodpecker-ci.org"; homepage = "https://woodpecker-ci.org";
license = licenses.asl20; license = licenses.asl20;
platforms = platforms.linux ++ platforms.darwin; platforms = platforms.linux ++ platforms.darwin;
}; };
in buildGoModule rec { in buildGoModule rec {
pname = "woodpecker-server"; pname = "woodpecker-server";
inherit version; inherit version;
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
''; '';
} }