public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #45949 from jtojnar/gcolor3

Browse Source 
gcolor3: 2.2 → 2.3
This commit is contained in:
Jan Tojnar 2018-09-02 18:24:23 +01:00 committed by GitHub
commit e2a731fc5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pkgs/applications/graphics/gcolor3/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, gnome3, libtool, intltool, pkgconfig, gtk3, hicolor-icon-theme, wrapGAppsHook } : { stdenv, fetchFromGitHub, fetchpatch, gnome3, meson, ninja, gettext, pkgconfig, libxml2, gtk3, hicolor-icon-theme, wrapGAppsHook }:
let let
version = "2.2"; version = "2.3";
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "gcolor3-${version}"; name = "gcolor3-${version}";
@ -9,23 +9,35 @@ in stdenv.mkDerivation {
owner = "hjdskes"; owner = "hjdskes";
repo = "gcolor3"; repo = "gcolor3";
rev = "v${version}"; rev = "v${version}";
sha256 = "1rbahsi33pfggpj5cigy6wy5333g3rpm8v2q0b35c6m7pwhmf2gr"; sha256 = "186j72kwsqdcakvdik9jl18gz3csdj53j3ylwagr9gfwmy0nmyjb";
}; };
nativeBuildInputs = [ gnome3.gnome-common libtool intltool pkgconfig hicolor-icon-theme wrapGAppsHook ]; patches = [
# Fix darwin build
(fetchpatch {
url = https://github.com/Hjdskes/gcolor3/commit/9130ffeff091fbafff6a0c8f06b09f54657d5dfd.patch;
sha256 = "1kn5hx536wivafb4awg7lsa8h32njy0lynmn7ci9y78dlp54057r";
})
(fetchpatch {
url = https://github.com/Hjdskes/gcolor3/commit/8d89081a8e13749f5a9051821114bc5fe814eaf3.patch;
sha256 = "1ldyr84dl2g6anqkp2mpxsrcr41fcqwi6ck14rfhai7rgrm8yar3";
})
];
buildInputs = [ gtk3 ]; nativeBuildInputs = [ meson ninja gettext pkgconfig libxml2 wrapGAppsHook ];
configureScript = "./autogen.sh"; buildInputs = [ gtk3 hicolor-icon-theme ];
# clang-4.0: error: argument unused during compilation: '-pthread' postPatch = ''
NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isClang "-Wno-error=unused-command-line-argument"; chmod +x meson_install.sh # patchShebangs requires executable file
patchShebangs meson_install.sh
'';
meta = { meta = with stdenv.lib; {
description = "A simple color chooser written in GTK3"; description = "A simple color chooser written in GTK3";
homepage = https://hjdskes.github.io/projects/gcolor3/; homepage = https://hjdskes.github.io/projects/gcolor3/;
license = stdenv.lib.licenses.gpl2; license = licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ jtojnar ]; maintainers = with maintainers; [ jtojnar ];
platforms = stdenv.lib.platforms.unix; platforms = platforms.unix;
}; };
} }