small changes & code refactoring

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

View File

@ -5,13 +5,12 @@ stdenv.mkDerivation rec {
version = "1.4.0";
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=";
};
#required dependencies
#required & optional dependencies
reqDeps = [cairo libjpeg libpng libtool libuuid];
#optional dependencies
optDeps = [ffmpeg freerdp pango libssh2 libtelnet libvncserver libwebsockets pulseaudio openssl libvorbis libwebp];
buildInputs = reqDeps ++ optDeps;

View File

@ -1,40 +1,40 @@
with import <nixpkgs> {};
let
version = "0.15.1";
src = fetchFromGitHub {
owner = "woodpecker-ci";
repo = "woodpecker";
rev = "v${version}";
sha256 = "ilywzKczcER7kO19X6vhn28HieeT7ZTSsoKyu802bS0=";
};
frontend = mkYarnPackage {
pname = "woodpecker-frontend";
inherit version;
src = "${src}/web";
packageJSON = "${src}/web/package.json";
yarnLock = "${src}/web/yarn.lock";
buildPhase = ''
yarn build
'';
distPhase = "true";
};
meta = with lib; {
version = "0.15.1";
src = fetchFromGitHub {
owner = "woodpecker-ci";
repo = "woodpecker";
rev = "v${version}";
sha256 = "ilywzKczcER7kO19X6vhn28HieeT7ZTSsoKyu802bS0=";
};
frontend = mkYarnPackage {
pname = "woodpecker-frontend";
inherit version;
src = "${src}/web";
packageJSON = "${src}/web/package.json";
yarnLock = "${src}/web/yarn.lock";
buildPhase = ''
yarn build
'';
distPhase = "true";
};
meta = with lib; {
description = "Woodpecker is a community fork of the Drone CI system.";
homepage = "https://woodpecker-ci.org";
license = licenses.asl20;
platforms = platforms.linux ++ platforms.darwin;
};
in buildGoModule rec {
pname = "woodpecker-server";
inherit version;
inherit src;
vendorSha256 = null;
subPackages = [ "cmd/server" ];
buildInputs = [pkgs.glibc.static];
CGO_ENABLED = true;
cflags="-I${pkgs.glibc.dev}/include";
ldflags = ["-s" "-w" ''-extldflags "-static"'' "-X github.com/woodpecker-ci/woodpecker/version.Version=${version}" "-L ${pkgs.glibc}/lib"];
postPatch = ''
cp -r ${frontend}/libexec/woodpecker-ci/deps/woodpecker-ci/dist web/dist
'';
pname = "woodpecker-server";
inherit version;
inherit src;
vendorSha256 = null;
subPackages = [ "cmd/server" ];
buildInputs = [glibc.static];
CGO_ENABLED = true;
cflags="-I ${glibc.dev}/include";
ldflags = ["-s" "-w" ''-extldflags "-static"'' "-X github.com/woodpecker-ci/woodpecker/version.Version=${version}" "-L ${glibc}/lib"];
postPatch = ''
cp -r ${frontend}/libexec/woodpecker-ci/deps/woodpecker-ci/dist web/dist
'';
}