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

explicit unfiltered src

Browse Source
This commit is contained in:
shimun 2020-12-28 18:23:44 +01:00
parent 37027d2f98
commit ceece00d04
Signed by: shimun
GPG Key ID: E81D8382DC2F971B
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
default.nix
View File

@ -6,8 +6,8 @@
, src ? ./. , src ? ./.
}: }:
let let
filteredSrc = builtins.filterSource pkgs.lib.cleanSourceFilter src; filteredSrc = src; # flake only includeds filed tracked by git 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 = "9f3f42bfecebbc3be5526a4194c82fdfc53269e9"; }}/tools.nix" { inherit pkgs; };
overrides = with pkgs; let overrides = with pkgs; let
clang = llvmPackages_10.clang; clang = llvmPackages_10.clang;
libclang = llvmPackages_10.libclang; libclang = llvmPackages_10.libclang;
@ -23,14 +23,11 @@ let
}; };
}; };
client = with pkgs; runCommandLocal "brownpaper" { client = with pkgs; runCommandLocal "brownpaper" {
script = ./bp.sh; script = "${filteredSrc}/bp.sh";
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
} '' } ''
makeWrapper $script $out/bin/brownpaper \ makeWrapper $script $out/bin/brownpaper \
--prefix PATH : ${lib.makeBinPath [ bash curl gnupg ]} --prefix PATH : ${lib.makeBinPath [ bash curl gnupg ]}
''; '';
# client = pkgs.writeShellScriptBin "brownpaper" ''
# PATH=${pkgs.bash}/bin/:${pkgs.gnupg}/bin/:${pkgs.curl}/bin/:$PATH ${./bp.sh} "$@"
# '';
in in
{ server = callPackage (crate2nix_tools.generatedCargoNix { inherit name; src = filteredSrc; }) { inherit pkgs; defaultCrateOverrides = overrides; }; inherit client; } { server = (callPackage (crate2nix_tools.generatedCargoNix { inherit name; src = filteredSrc; }) { inherit pkgs; defaultCrateOverrides = overrides; }).rootCrate.build; inherit client; }

4
flake.nix
View File

@ -3,12 +3,12 @@
outputs = { self, nixpkgs }: rec { outputs = { self, nixpkgs }: rec {
nixosModules.brownpaper = import ./mod.nix; nixosModules.brownpaper = import ./mod.nix;
packages = legacyPackages =
let let
pkg = system: pkg = system:
let let
pkgs = import nixpkgs { inherit system; }; pkgs = import nixpkgs { inherit system; };
bp = pkgs.callPackage ./default.nix { inherit pkgs; }; bp = pkgs.callPackage ./default.nix { inherit pkgs; src = ./.; };
in in
{ brownpaper = bp.client; brownpaper-server = bp.server; }; { brownpaper = bp.client; brownpaper-server = bp.server; };
in in

2
mod.nix
View File

@ -87,7 +87,7 @@ in
serviceConfig = serviceConfig =
{ {
BindPaths = [ cfg.dataDir ]; BindPaths = [ cfg.dataDir ];
ExecStart = "${package.server.rootCrate.build}/bin/brownpaper ${cfg.listen}:${toString cfg.port}"; ExecStart = "${package.server}/bin/brownpaper ${cfg.listen}:${toString cfg.port}";
User = cfg.user; User = cfg.user;
}; };
}; };