Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 794c4ec7fb77
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: eb9de57dd7b9
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Sep 17, 2018

  1. gcolor3: 2.3 → 2.3.1

    jtojnar committed Sep 17, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    Copy the full SHA
    eb9de57 View commit details
Showing with 8 additions and 19 deletions.
  1. +8 −19 pkgs/applications/graphics/gcolor3/default.nix
27 changes: 8 additions & 19 deletions pkgs/applications/graphics/gcolor3/default.nix
Original file line number Diff line number Diff line change
@@ -1,29 +1,18 @@
{ stdenv, fetchFromGitHub, fetchpatch, gnome3, meson, ninja, gettext, pkgconfig, libxml2, gtk3, hicolor-icon-theme, wrapGAppsHook }:
{ stdenv, fetchFromGitLab, gnome3, meson, ninja, gettext, pkgconfig, libxml2, gtk3, hicolor-icon-theme, wrapGAppsHook }:

let
version = "2.3";
version = "2.3.1";
in stdenv.mkDerivation {
name = "gcolor3-${version}";

src = fetchFromGitHub {
owner = "hjdskes";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "gcolor3";
rev = "v${version}";
sha256 = "186j72kwsqdcakvdik9jl18gz3csdj53j3ylwagr9gfwmy0nmyjb";
sha256 = "10cfzlkflwkb7f51rnrxmgxpfryh1qzvqaydj6lffjq9zvnhigg7";
};

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";
})
];

nativeBuildInputs = [ meson ninja gettext pkgconfig libxml2 wrapGAppsHook ];

buildInputs = [ gtk3 hicolor-icon-theme ];
@@ -35,8 +24,8 @@ in stdenv.mkDerivation {

meta = with stdenv.lib; {
description = "A simple color chooser written in GTK3";
homepage = https://hjdskes.github.io/projects/gcolor3/;
license = licenses.gpl2;
homepage = https://www.hjdskes.nl/projects/gcolor3/;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ jtojnar ];
platforms = platforms.unix;
};