Clean up flake, remove pdfium dependency

This commit is contained in:
Julian Mutter 2023-11-22 13:35:01 +01:00
parent c6d8eb4a59
commit 1db3c212ba
4 changed files with 24 additions and 844 deletions

809
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -12,4 +12,3 @@ glib = "0.18.3"
clap = { version = "4.4.6", features = ["derive"] }
gtk = { version = "0.7.3", package = "gtk4", features = ["v4_8"] }
async-channel = "2.1.0"
pdfium-render = "0.8.15"

18
flake.lock generated
View File

@ -5,11 +5,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1694081375,
"narHash": "sha256-vzJXOUnmkMCm3xw8yfPP5m8kypQ3BhAIRe4RRCWpzy8=",
"lastModified": 1698420672,
"narHash": "sha256-/TdeHMPRjjdJub7p7+w55vyABrsJlt5QkznPYy55vKA=",
"owner": "nix-community",
"repo": "naersk",
"rev": "3f976d822b7b37fc6fb8e6f157c2dd05e7e94e89",
"rev": "aeb58d5e8faead8980a807c840232697982d47b9",
"type": "github"
},
"original": {
@ -21,11 +21,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1695806987,
"narHash": "sha256-fX5kGs66NZIxCMcpAGIpxuftajHL8Hil1vjHmjjl118=",
"lastModified": 1700538105,
"narHash": "sha256-uZhOCmwv8VupEmPZm3erbr9XXmyg7K67Ul3+Rx2XMe0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f3dab3509afca932f3f4fd0908957709bb1c1f57",
"rev": "51a01a7e5515b469886c120e38db325c96694c2f",
"type": "github"
},
"original": {
@ -35,11 +35,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1695806987,
"narHash": "sha256-fX5kGs66NZIxCMcpAGIpxuftajHL8Hil1vjHmjjl118=",
"lastModified": 1700538105,
"narHash": "sha256-uZhOCmwv8VupEmPZm3erbr9XXmyg7K67Ul3+Rx2XMe0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f3dab3509afca932f3f4fd0908957709bb1c1f57",
"rev": "51a01a7e5515b469886c120e38db325c96694c2f",
"type": "github"
},
"original": {

View File

@ -10,34 +10,20 @@
let
pkgs = import nixpkgs { inherit system; };
naersk-lib = pkgs.callPackage naersk { };
nativeBuildInputs = with pkgs; [
gtk4
cairo
glib
pkg-config
poppler
wrapGAppsHook
];
in {
defaultPackage = naersk-lib.buildPackage {
src = ./.;
inherit nativeBuildInputs;
};
devShell = with pkgs;
mkShell {
inherit nativeBuildInputs;
buildInputs = [
cargo
rustc
rustfmt
rust-analyzer
pre-commit
rustPackages.clippy
cargo-outdated
cargo-audit
in
{
defaultPackage = naersk-lib.buildPackage
{
src = ./.;
nativeBuildInputs = with pkgs; [
gtk4
cairo
glib
pkg-config
poppler
wrapGAppsHook
];
RUST_SRC_PATH = rustPlatform.rustLibSrc;
};
});
}