Compare commits

..

No commits in common. "8e0826b8b3222629dc2cdb1db5e656da68d8d29a" and "d91b0b04abc70aeb8a99ba7ea00d773b598c246b" have entirely different histories.

View File

@ -3,9 +3,7 @@
, full ? true , full ? true
}: }:
pkgs.stdenv.mkDerivation rec { pkgs.stdenv.mkDerivation rec {
_pname = "xK"; pname = "xK";
pname = pkgs.lib.strings.toLower _pname;
_version = pkgs.lib.strings.fileContents (src + "/xK-version");
version = "master"; version = "master";
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [
@ -39,12 +37,12 @@ pkgs.stdenv.mkDerivation rec {
src = if local then src = if local then
builtins.path { builtins.path {
path = ../${_pname}/git; path = ../${pname}/git;
name = "${_pname}"; name = "${pname}";
} }
else else
fetchGit { fetchGit {
url = "https://git.janouch.name/p/${_pname}.git"; url = "https://git.janouch.name/p/${pname}.git";
submodules = true; submodules = true;
ref = "master"; ref = "master";
}; };
@ -57,11 +55,10 @@ pkgs.stdenv.mkDerivation rec {
]; ];
xP = pkgs.buildGoModule rec { xP = pkgs.buildGoModule rec {
_pname = "xP"; pname = "xP";
pname = pkgs.lib.strings.toLower _pname;
inherit version src doCheck meta; inherit version src doCheck meta;
modRoot = "./${_pname}/"; modRoot = "./${pname}/";
# vendorHash = pkgs.lib.fakeHash; # vendorHash = pkgs.lib.fakeHash;
vendorHash = "sha256-TK3rivjzYZwG8bfia22iQO5ZKnBzeIidsHNl6jnQUio="; vendorHash = "sha256-TK3rivjzYZwG8bfia22iQO5ZKnBzeIidsHNl6jnQUio=";
@ -88,24 +85,16 @@ pkgs.stdenv.mkDerivation rec {
}; };
xS = pkgs.buildGoModule rec { xS = pkgs.buildGoModule rec {
_pname = "xS"; pname = "xS";
pname = pkgs.lib.strings.toLower _pname;
inherit version src doCheck meta; inherit version src doCheck meta;
modRoot = "./${_pname}/"; modRoot = "./${pname}/";
vendorHash = null; vendorHash = null;
# This invokes a premature build that may miss compiler flags. # This invokes a premature build that may miss compiler flags.
preBuild = '' preBuild = ''
make make
''; '';
ldflags = [ "-X 'main.projectVersion=${_version}'" ];
postInstall = ''
mkdir -p $out/share/man/man1
mv xS.1 $out/share/man/man1
'';
}; };
# While we can't include them in this derivation, we can link to them. # While we can't include them in this derivation, we can link to them.
@ -119,7 +108,7 @@ pkgs.stdenv.mkDerivation rec {
meta = with pkgs.lib; { meta = with pkgs.lib; {
description = "IRC daemon, bot, TUI client" description = "IRC daemon, bot, TUI client"
+ optionals full " and its web frontend"; + optionals full " and its web frontend";
homepage = "https://git.janouch.name/p/${_pname}"; homepage = "https://git.janouch.name/p/${pname}";
platforms = platforms.all; platforms = platforms.all;
license = licenses.bsd0; license = licenses.bsd0;
}; };