julian/music-reader
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up flake, remove pdfium dependency

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

809
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

1
Cargo.toml
View File

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

18
flake.lock generated
View File

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

40
flake.nix
View File

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