diff --git a/default.nix b/default.nix index 4123359..d0615b4 100644 --- a/default.nix +++ b/default.nix @@ -22,8 +22,15 @@ let buildInputs = [ gmp ]; }; }; - client = pkgs.writeShellScriptBin "brownpaper" '' - PATH=${pkgs.bash}/bin/:${pkgs.gnupg}/bin/:${pkgs.curl}/bin/:$PATH ${./bp.sh} "$@" + client = with pkgs; runCommandLocal "brownpaper" { + script = ./bp.sh; + nativeBuildInputs = [ makeWrapper ]; + } '' + makeWrapper $script $out/bin/brownpaper \ + --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 { server = callPackage (crate2nix_tools.generatedCargoNix { inherit name; src = filteredSrc; }) { inherit pkgs; defaultCrateOverrides = overrides; }; inherit client; } diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..83fcb7c --- /dev/null +++ b/flake.nix @@ -0,0 +1,21 @@ +{ + description = "Brownpaper pastebin"; + + outputs = { self, nixpkgs }: rec { + nixosModules.brownpaper = import ./mod.nix; + packages = + let + pkg = system: + let + pkgs = import nixpkgs { inherit system; }; + bp = pkgs.callPackage ./default.nix { inherit pkgs; }; + in + { brownpaper = bp.client; }; + in + { + "x86_64-linux" = pkg "x86_64-linux"; + "aarch64-linux" = pkg "aarch64-linux"; + "i686-linux" = pkg "i686-linux"; + }; + }; +}