Jan Tojnar
2020-08-30 08:13:54 +02:00
parent 9d937af9db
commit ddd234cc6f
+26 -17
View File
@@ -1,31 +1,40 @@
{ stdenv, fetchFromGitLab, meson, ninja, gettext, pkgconfig, libxml2, gtk3, hicolor-icon-theme, wrapGAppsHook { stdenv
, fetchpatch }: , fetchFromGitLab
, meson
, ninja
, gettext
, pkg-config
, libxml2
, gtk3
, libportal
, wrapGAppsHook
}:
let stdenv.mkDerivation rec {
version = "2.3.1";
in stdenv.mkDerivation {
pname = "gcolor3"; pname = "gcolor3";
inherit version; version = "2.4.0";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.gnome.org"; domain = "gitlab.gnome.org";
owner = "World"; owner = "World";
repo = "gcolor3"; repo = "gcolor3";
rev = "v${version}"; rev = "v${version}";
sha256 = "10cfzlkflwkb7f51rnrxmgxpfryh1qzvqaydj6lffjq9zvnhigg7"; sha256 = "rHIAjk2m3Lkz11obgNZaapa1Zr2GDH7XzgzuAJmq+MU=";
}; };
patches = [ nativeBuildInputs = [
# Remove useage of deprecrated G_PARAM_PRIVATE meson
(fetchpatch { ninja
url = "https://gitlab.gnome.org/World/gcolor3/commit/96612cdd6c2cc71e28eb97ee17956004a05e5140.patch"; gettext
sha256 = "134wv5x15bd7k0fjzifrddwssaq213sx2l38r3xw6x1j625qwzq9"; pkg-config
}) libxml2 # xml-stripblanks preprocessing of GResource
wrapGAppsHook
]; ];
nativeBuildInputs = [ meson ninja gettext pkgconfig libxml2 wrapGAppsHook ]; buildInputs = [
gtk3
buildInputs = [ gtk3 hicolor-icon-theme ]; libportal
];
postPatch = '' postPatch = ''
chmod +x meson_install.sh # patchShebangs requires executable file chmod +x meson_install.sh # patchShebangs requires executable file
@@ -34,7 +43,7 @@ in stdenv.mkDerivation {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A simple color chooser written in GTK3"; 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; license = licenses.gpl2Plus;
maintainers = with maintainers; [ jtojnar ]; maintainers = with maintainers; [ jtojnar ];
platforms = platforms.unix; platforms = platforms.unix;