summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.nix2
-rw-r--r--pkgs/gradience.nix83
-rw-r--r--pkgs/material-color-utilities.nix24
-rw-r--r--pkgs/treefetch.nix4
4 files changed, 3 insertions, 110 deletions
diff --git a/flake.nix b/flake.nix
index 395bfa9..73c18d6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,8 +26,6 @@
packageSet = pkgs:
with pkgs; rec {
treefetch = callPackage ./pkgs/treefetch.nix {};
- material-color-utilities = callPackage ./pkgs/material-color-utilities.nix {};
- gradience = callPackage ./pkgs/gradience.nix {inherit material-color-utilities;};
swhkd = callPackage ./pkgs/swhkd {};
vim-just = callPackage ./pkgs/vim-just.nix {};
};
diff --git a/pkgs/gradience.nix b/pkgs/gradience.nix
deleted file mode 100644
index 0ea72da..0000000
--- a/pkgs/gradience.nix
+++ /dev/null
@@ -1,83 +0,0 @@
-{
- lib,
- fetchFromGitHub,
- python3Packages,
- wrapGAppsHook,
- blueprint-compiler,
- desktop-file-utils,
- gobject-introspection,
- libadwaita,
- libsoup_3,
- libportal-gtk4,
- meson,
- ninja,
- pkg-config,
- material-color-utilities,
- sassc,
-}: let
- pythonDeps = with python3Packages; [
- pygobject3
- anyascii
- cssutils
- jinja2
- lxml
- material-color-utilities
- pillow
- pluggy
- regex
- svglib
- Yapsy
- ];
-in
- python3Packages.buildPythonApplication rec {
- pname = "gradience";
- version = "0.4.1";
- format = "other";
-
- src = fetchFromGitHub {
- owner = "GradienceTeam";
- repo = "Gradience";
- rev = version;
- sha256 = "sha256-xR3wPU0ax9U4995GckC8UGJqrUErd+jS5z3D/jWCdXQ=";
- };
-
- nativeBuildInputs =
- [
- meson
- ninja
- blueprint-compiler
- desktop-file-utils
- gobject-introspection
- libsoup_3
- pkg-config
- sassc
- wrapGAppsHook
- ]
- ++ pythonDeps;
-
- buildInputs = [
- libadwaita
- libportal-gtk4
- libsoup_3
- ];
-
- pythonPath = pythonDeps;
-
- dontWrapGApps = true;
-
- preFixup = ''
- makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
- '';
-
- postFixup = ''
- wrapPythonProgramsIn "$out/bin" "$out/lib $pythonPath"
- '';
-
- meta = with lib; {
- description = "A tool for customizing Libadwaita applications and the adw-gtk3 theme.";
- homepage = "https://gradienceteam.github.io/";
- license = licenses.gpl3;
- maintainers = with maintainers; [getchoo];
- platforms = platforms.linux;
- };
- }
diff --git a/pkgs/material-color-utilities.nix b/pkgs/material-color-utilities.nix
deleted file mode 100644
index d6e9f1c..0000000
--- a/pkgs/material-color-utilities.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- lib,
- fetchPypi,
- python3Packages,
-}:
-python3Packages.buildPythonPackage rec {
- pname = "material-color-utilities";
- version = "0.1.5";
- src = fetchPypi {
- pname = "${pname}-python";
- inherit version;
- sha256 = "sha256-PG8C585wWViFRHve83z3b9NijHyV+iGY2BdMJpyVH64=";
- };
-
- nativeBuildInputs = with python3Packages; [poetry-core];
- propagatedBuildInputs = with python3Packages; [pillow regex];
-
- meta = with lib; {
- description = "Python port of material-color-utilities used for Material You colors";
- license = licenses.asl20;
- maintainers = with maintainers; [getchoo];
- platforms = platforms.all;
- };
-}
diff --git a/pkgs/treefetch.nix b/pkgs/treefetch.nix
index 35545ac..2c3c130 100644
--- a/pkgs/treefetch.nix
+++ b/pkgs/treefetch.nix
@@ -19,7 +19,9 @@ in
sha256 = "sha256-FDiulTit492KwV46A3qwjHQwzpjVJvIXTfTrMufXd5k=";
};
- cargoLock.lockFile = "${src}/Cargo.lock";
+ cargoLock = {
+ lockFile = "${src}/Cargo.lock";
+ };
meta = {
description = "A plant-based system fetch tool made with Rust.";