shimun/brownpaper
1
0
Fork 0
Code Issues Pull Requests Releases Activity

clean source

Browse Source
This commit is contained in:
shimun 2020-12-27 19:32:57 +01:00
parent 3cc5617307
commit 45dd09183d
Signed by: shimun
GPG Key ID: E81D8382DC2F971B
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
default.nix
View File

@ -1,11 +1,12 @@
{ pkgs ? import <nixpkgs> { } { pkgs ? (import <nixpkgs> { })
, callPackage ? pkgs.callPackage , callPackage ? pkgs.callPackage
, stdenv ? pkgs.stdenv , stdenv ? pkgs.stdenv
, fetchgit ? pkgs.fetchgit , fetchgit ? pkgs.fetchgit
, name ? "brownpaper" , name ? "brownpaper"
, src ? (builtins.filterSource (path: type: baseNameOf path != "target") ./.) , src ? ./.
}: }:
let let
filteredSrc = builtins.filterSource pkgs.lib.cleanSourceFilter src;
crate2nix_tools = import "${fetchgit { url = "https://github.com/kolloch/crate2nix.git"; rev = "adecff03c53b87255b3299f5a5787327342a69b2"; sha256 = "0l10yqa3gq73fc4xc977vb9zk5jlp70xiz5qd9c1vq873yqk1c7g"; }}/tools.nix" { inherit pkgs; }; crate2nix_tools = import "${fetchgit { url = "https://github.com/kolloch/crate2nix.git"; rev = "adecff03c53b87255b3299f5a5787327342a69b2"; sha256 = "0l10yqa3gq73fc4xc977vb9zk5jlp70xiz5qd9c1vq873yqk1c7g"; }}/tools.nix" { inherit pkgs; };
overrides = with pkgs; let overrides = with pkgs; let
clang = llvmPackages_10.clang; clang = llvmPackages_10.clang;
@ -25,4 +26,4 @@ let
PATH=${pkgs.bash}/bin/:${pkgs.gnupg}/bin/:${pkgs.curl}/bin/:$PATH ${./bp.sh} "$@" PATH=${pkgs.bash}/bin/:${pkgs.gnupg}/bin/:${pkgs.curl}/bin/:$PATH ${./bp.sh} "$@"
''; '';
in in
{ server = callPackage (crate2nix_tools.generatedCargoNix { inherit name src; }) { inherit pkgs; defaultCrateOverrides = overrides; }; inherit client; } { server = callPackage (crate2nix_tools.generatedCargoNix { inherit name; src = filteredSrc; }) { inherit pkgs; defaultCrateOverrides = overrides; }; inherit client; }

5
mod.nix
View File

@ -3,6 +3,7 @@ with lib;
let let
cfg = config.services.brownpaper; cfg = config.services.brownpaper;
cfgc = config.programs.brownpaper; cfgc = config.programs.brownpaper;
package = pkgs.callPackage ./. { inherit pkgs; src = ./.; };
keyDir = pkgs.runCommand "brownpaper-keys" { } '' keyDir = pkgs.runCommand "brownpaper-keys" { } ''
mkdir -p $out mkdir -p $out
${concatStringsSep " && " (builtins.map (key: "ln -s ${key} $out") cfg.pgpKeys)} ${concatStringsSep " && " (builtins.map (key: "ln -s ${key} $out") cfg.pgpKeys)}
@ -86,7 +87,7 @@ in
serviceConfig = serviceConfig =
{ {
BindPaths = [ cfg.dataDir ]; BindPaths = [ cfg.dataDir ];
ExecStart = "${(pkgs.callPackage ./. { inherit pkgs; src = ./.; }).server.rootCrate.build}/bin/brownpaper ${cfg.listen}:${toString cfg.port}"; ExecStart = "${package.server.rootCrate.build}/bin/brownpaper ${cfg.listen}:${toString cfg.port}";
User = cfg.user; User = cfg.user;
}; };
}; };
@ -96,7 +97,7 @@ in
}; };
environment.systemPackages = optionals cfgc.enable [ environment.systemPackages = optionals cfgc.enable [
(pkgs.writeShellScriptBin "brownpaper" '' (pkgs.writeShellScriptBin "brownpaper" ''
BROWNPAPER_ENDPOINT='${cfgc.endpoint}' ${(pkgs.callPackage ./. { inherit pkgs; src = ./.; }).client}/bin/brownpaper "$@" BROWNPAPER_ENDPOINT='${cfgc.endpoint}' ${package.client}/bin/brownpaper "$@"
'') '')
]; ];
}; };