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

fix: string coerce err

Browse Source
This commit is contained in:
shimun 2021-05-02 12:58:07 +02:00
parent d06cf71e8d
commit c66cf653cb
Signed by: shimun
GPG Key ID: E81D8382DC2F971B
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
default.nix
View File

@ -7,28 +7,26 @@
}: }:
let let
filteredSrc = src; # flake only includeds files tracked by git builtins.filterSource pkgs.lib.cleanSourceFilter src; filteredSrc = src; # flake only includeds files tracked by git builtins.filterSource pkgs.lib.cleanSourceFilter src;
crate2nix = fetchGit { url = "https://github.com/kolloch/crate2nix.git"; rev = "2f861db71475b4cf0d266b8d2fd625cccf1e331b"; }; crate2nix = fetchGit { url = "https://github.com/kolloch/crate2nix.git"; rev = "445c74fdbc7fe01694814b7bc349a89942c7d8a0"; };
crate2nix_tools = (if builtins.compareVersions pkgs.crate2nix.version "0.8.0" == 1 then import (pkgs.crate2nix.src + "/tools.nix") else import "${crate2nix}/tools.nix") { inherit pkgs; }; crate2nix_tools = (if builtins.compareVersions pkgs.crate2nix.version "0.8.0" == 1 then import (pkgs.crate2nix.src + "/tools.nix") else import "${crate2nix}/tools.nix") { inherit pkgs; };
overrides = with pkgs; let overrides = with pkgs.llvmPackages_10;
clang = llvmPackages_10.clang; pkgs.defaultCrateOverrides // rec {
libclang = llvmPackages_10.libclang;
in
defaultCrateOverrides // rec {
nettle-sys = attrs: rec { nettle-sys = attrs: rec {
nativeBuildInputs = [ clang pkg-config ]; nativeBuildInputs = [ clang pkgs.pkg-config ];
buildInputs = [ nettle ]; buildInputs = [ pkgs.nettle ];
LIBCLANG_PATH = "${libclang}/lib"; LIBCLANG_PATH = "${libclang}/lib";
}; };
brownpaper = attrs: { brownpaper = attrs: {
buildInputs = [ gmp (pkgs.callPackage "${crate2nix}/crate2nix/Cargo.nix" { strictDeprecation = true; }) ]; buildInputs = [ pkgs.gmp ];
}; };
}; };
client = with pkgs; runCommandLocal "brownpaper" { client = with pkgs; runCommandLocal "brownpaper"
{
script = "${filteredSrc}/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 : ${with pkgs; lib.makeBinPath [ bash curl gnupg ]}
''; '';
in in
{ server = (callPackage (crate2nix_tools.generatedCargoNix { inherit name; src = filteredSrc; }) { inherit pkgs; defaultCrateOverrides = overrides; }).rootCrate.build; inherit client; } { server = (callPackage (crate2nix_tools.generatedCargoNix { inherit name; src = filteredSrc; }) { inherit pkgs; defaultCrateOverrides = overrides; }).rootCrate.build; inherit client; }