clean source

This commit is contained in:
2020-12-27 19:32:57 +01:00
parent 3cc5617307
commit 45dd09183d
2 changed files with 7 additions and 5 deletions

View File

@@ -1,11 +1,12 @@
{ pkgs ? import <nixpkgs> { }
{ pkgs ? (import <nixpkgs> { })
, callPackage ? pkgs.callPackage
, stdenv ? pkgs.stdenv
, fetchgit ? pkgs.fetchgit
, name ? "brownpaper"
, src ? (builtins.filterSource (path: type: baseNameOf path != "target") ./.)
, src ? ./.
}:
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; };
overrides = with pkgs; let
clang = llvmPackages_10.clang;
@@ -25,4 +26,4 @@ let
PATH=${pkgs.bash}/bin/:${pkgs.gnupg}/bin/:${pkgs.curl}/bin/:$PATH ${./bp.sh} "$@"
'';
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; }