aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/applications/graphics/gcolor3/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/applications/graphics/gcolor3/default.nix')
-rw-r--r--nixpkgs/pkgs/applications/graphics/gcolor3/default.nix43
1 files changed, 26 insertions, 17 deletions
diff --git a/nixpkgs/pkgs/applications/graphics/gcolor3/default.nix b/nixpkgs/pkgs/applications/graphics/gcolor3/default.nix
index 1c1c6ba08ee..2962825e49b 100644
--- a/nixpkgs/pkgs/applications/graphics/gcolor3/default.nix
+++ b/nixpkgs/pkgs/applications/graphics/gcolor3/default.nix
@@ -1,31 +1,40 @@
-{ stdenv, fetchFromGitLab, meson, ninja, gettext, pkgconfig, libxml2, gtk3, hicolor-icon-theme, wrapGAppsHook
-, fetchpatch }:
+{ stdenv
+, fetchFromGitLab
+, meson
+, ninja
+, gettext
+, pkg-config
+, libxml2
+, gtk3
+, libportal
+, wrapGAppsHook
+}:
-let
- version = "2.3.1";
-in stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "gcolor3";
- inherit version;
+ version = "2.4.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "gcolor3";
rev = "v${version}";
- sha256 = "10cfzlkflwkb7f51rnrxmgxpfryh1qzvqaydj6lffjq9zvnhigg7";
+ sha256 = "rHIAjk2m3Lkz11obgNZaapa1Zr2GDH7XzgzuAJmq+MU=";
};
- patches = [
- # Remove useage of deprecrated G_PARAM_PRIVATE
- (fetchpatch {
- url = "https://gitlab.gnome.org/World/gcolor3/commit/96612cdd6c2cc71e28eb97ee17956004a05e5140.patch";
- sha256 = "134wv5x15bd7k0fjzifrddwssaq213sx2l38r3xw6x1j625qwzq9";
- })
+ nativeBuildInputs = [
+ meson
+ ninja
+ gettext
+ pkg-config
+ libxml2 # xml-stripblanks preprocessing of GResource
+ wrapGAppsHook
];
- nativeBuildInputs = [ meson ninja gettext pkgconfig libxml2 wrapGAppsHook ];
-
- buildInputs = [ gtk3 hicolor-icon-theme ];
+ buildInputs = [
+ gtk3
+ libportal
+ ];
postPatch = ''
chmod +x meson_install.sh # patchShebangs requires executable file
@@ -34,7 +43,7 @@ in stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "A simple color chooser written in GTK3";
- homepage = "https://www.hjdskes.nl/projects/gcolor3/";
+ homepage = "https://gitlab.gnome.org/World/gcolor3";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ jtojnar ];
platforms = platforms.unix;