mirror of
https://github.com/JaxTheWolf/nixos.git
synced 2026-04-01 02:00:22 +02:00
Generale update
This commit is contained in:
25
flake.lock
generated
25
flake.lock
generated
@@ -19,15 +19,16 @@
|
||||
"czkawka-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1766866815,
|
||||
"narHash": "sha256-j2O9mBsujjdS/gsD3p8Lcry9qYu/SkJf+fttNT/hjQA=",
|
||||
"lastModified": 1742109806,
|
||||
"narHash": "sha256-ePiHDfQ1QC3nff8uWE0ggiTuulBomuoZ3ta0redUYXY=",
|
||||
"owner": "qarmin",
|
||||
"repo": "czkawka",
|
||||
"rev": "420d044b74c2472f9067ef64ca6763214ca14715",
|
||||
"rev": "5dc8d38cfef639b71e74468a284677b5ec9f97bf",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "qarmin",
|
||||
"ref": "9.0.0",
|
||||
"repo": "czkawka",
|
||||
"type": "github"
|
||||
}
|
||||
@@ -112,11 +113,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1767116409,
|
||||
"narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=",
|
||||
"lastModified": 1767379071,
|
||||
"narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "cad22e7d996aea55ecab064e84834289143e44a0",
|
||||
"rev": "fb7944c166a3b630f177938e478f0378e64ce108",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -128,11 +129,11 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1767227401,
|
||||
"narHash": "sha256-hLsBkzavn9t6VjOhc9HNP0+Z9HKMaTrRg6YgS73R3dY=",
|
||||
"lastModified": 1767593864,
|
||||
"narHash": "sha256-AtzRYWSxsyvySDzfOek0lKQXoQrHtpFHbBPZ6rdQIEA=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d6f739416f7151cd4a5c79443b5500e984341774",
|
||||
"rev": "1b717f421d250290b16de9a6033ea28258c46ae1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -144,11 +145,11 @@
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1767116409,
|
||||
"narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=",
|
||||
"lastModified": 1767379071,
|
||||
"narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "cad22e7d996aea55ecab064e84834289143e44a0",
|
||||
"rev": "fb7944c166a3b630f177938e478f0378e64ce108",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -4,10 +4,9 @@
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
|
||||
# The source code from GitHub
|
||||
czkawka-src = {
|
||||
url = "github:qarmin/czkawka";
|
||||
flake = false; # The upstream repo doesn't have a flake.nix
|
||||
url = "github:qarmin/czkawka/9.0.0";
|
||||
flake = false;
|
||||
};
|
||||
|
||||
# Naersk: Builds Rust crates without needing a manual cargoHash
|
||||
@@ -29,7 +28,6 @@
|
||||
pkgs = import nixpkgs { inherit system; };
|
||||
naersk-lib = pkgs.callPackage naersk { };
|
||||
|
||||
# Czkawka requires these system libraries
|
||||
nativeBuildInputs = with pkgs; [
|
||||
pkg-config
|
||||
wrapGAppsHook4
|
||||
@@ -45,7 +43,7 @@
|
||||
pango
|
||||
gdk-pixbuf
|
||||
atk
|
||||
# Optional: libadwaita if the master branch has switched to it
|
||||
libadwaita
|
||||
];
|
||||
|
||||
in
|
||||
@@ -55,11 +53,11 @@
|
||||
version = "master";
|
||||
src = czkawka-src;
|
||||
|
||||
# Add the dependencies
|
||||
inherit nativeBuildInputs buildInputs;
|
||||
|
||||
# We need to manually install the desktop files/icons because Naersk
|
||||
# only installs the binaries by default.
|
||||
RUSTFLAGS = "-C target-cpu=native";
|
||||
NIX_CFLAGS_COMPILE = "-march=native -mtune=native";
|
||||
|
||||
postInstall = ''
|
||||
install -Dm444 -t $out/share/applications data/com.github.qarmin.czkawka.desktop
|
||||
install -Dm444 -t $out/share/icons/hicolor/scalable/apps data/icons/com.github.qarmin.czkawka.svg
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
flake-utils.url = "github:numtide/flake-utils";
|
||||
|
||||
# This input automatically tracks the latest commit on master
|
||||
solaar-src = {
|
||||
url = "github:pwr-Solaar/Solaar/master";
|
||||
flake = false;
|
||||
@@ -29,14 +28,9 @@
|
||||
packages.default = pythonPackages.buildPythonApplication rec {
|
||||
pname = "solaar";
|
||||
version = "master-${solaar-src.shortRev or "dirty"}";
|
||||
|
||||
src = solaar-src;
|
||||
|
||||
# --- FIX STARTS HERE ---
|
||||
# 1. Enable pyproject format
|
||||
pyproject = true;
|
||||
|
||||
# 2. Add build tools (setuptools/wheel) to nativeBuildInputs
|
||||
nativeBuildInputs =
|
||||
with pkgs;
|
||||
[
|
||||
@@ -48,7 +42,6 @@
|
||||
setuptools
|
||||
wheel
|
||||
]);
|
||||
# --- FIX ENDS HERE ---
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [
|
||||
pyudev
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
config = {
|
||||
allowUnfree = true;
|
||||
permittedInsecurePackages = [
|
||||
"ventoy-gtk3-1.1.07"
|
||||
"ventoy-gtk3-1.1.10"
|
||||
];
|
||||
};
|
||||
overlays = [
|
||||
|
||||
Reference in New Issue
Block a user