diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:31:50 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:32:25 +0100 |
| commit | b7baf40e099b4215181fe7b0c63083b12ef2c7fb (patch) | |
| tree | a6efabd31d05b6d0a36624729e80377bbbfb0149 /nixpkgs/pkgs/applications/graphics/curtail/default.nix | |
| parent | 710028664e26e85cb831a869b3da9f6993902255 (diff) | |
| parent | 0799f514b1cd74878174939df79ac60ca5036673 (diff) | |
| download | nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.gz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.bz2 nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.lz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.xz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.zst nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/applications/graphics/curtail/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/graphics/curtail/default.nix | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/applications/graphics/curtail/default.nix b/nixpkgs/pkgs/applications/graphics/curtail/default.nix index 1d7df76c214e..30ca2289526b 100644 --- a/nixpkgs/pkgs/applications/graphics/curtail/default.nix +++ b/nixpkgs/pkgs/applications/graphics/curtail/default.nix @@ -5,7 +5,8 @@ , appstream-glib , desktop-file-utils , gettext -, gtk3 +, gtk4 +, libadwaita , meson , ninja , pkg-config @@ -14,18 +15,19 @@ , libwebp , optipng , pngquant +, oxipng }: python3.pkgs.buildPythonApplication rec { pname = "curtail"; - version = "1.3.1"; + version = "1.8.0"; format = "other"; src = fetchFromGitHub { owner = "Huluti"; repo = "Curtail"; rev = "refs/tags/${version}"; - sha256 = "sha256-/xvkRXs1EVu+9RZM+TnyIGxFV2stUR9XHEmaJxsJ3V8="; + sha256 = "sha256-LLz4nZ9WFQMogQR2gCKn80gvHUG5hlpQpcNjpr4fs2s="; }; nativeBuildInputs = [ @@ -33,7 +35,8 @@ python3.pkgs.buildPythonApplication rec { appstream-glib desktop-file-utils gettext - gtk3 + gtk4 + libadwaita meson ninja pkg-config @@ -43,7 +46,8 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ appstream-glib gettext - gtk3 + gtk4 + libadwaita ]; propagatedBuildInputs = [ @@ -59,7 +63,7 @@ python3.pkgs.buildPythonApplication rec { preFixup = '' makeWrapperArgs+=( "''${gappsWrapperArgs[@]}" - "--prefix" "PATH" ":" "${lib.makeBinPath [ jpegoptim libwebp optipng pngquant ]}" + "--prefix" "PATH" ":" "${lib.makeBinPath [ jpegoptim libwebp optipng pngquant oxipng ]}" ) ''; |