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: 58c618f7219f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cd044331ec6d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 27, 2019

  1. colord-gtk: 0.1.26 → 0.2.0 

    hughsie/colord-gtk@f74545c
    @jtojnar
    jtojnar committed Oct 27, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    GPG key ID: 7FAB2A15F7A607A4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    509a1e0 View commit details

  2. Merge pull request #72104 from jtojnar/colord-gtk 

    colord-gtk: 0.1.26 → 0.2.0
    @worldofpeace
    worldofpeace authored Oct 27, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cd04433 View commit details
Showing with 49 additions and 10 deletions.
  1. +49 −10 pkgs/tools/misc/colord-gtk/default.nix
59 changes: 49 additions & 10 deletions pkgs/tools/misc/colord-gtk/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,58 @@
{ stdenv, fetchurl, colord, intltool, glib, gtk3, pkgconfig, lcms2 }:
{ stdenv
, fetchurl
, colord
, gettext
, meson
, ninja
, gobject-introspection
, gtk-doc
, docbook-xsl-ns
, docbook_xsl
, docbook_xml_dtd_412
, libxslt
, glib
, gtk3
, pkgconfig
, lcms2
}:

stdenv.mkDerivation rec {
name = "colord-gtk-0.1.26";
pname = "colord-gtk";
version = "0.2.0";

outputs = [ "out" "dev" "devdoc" ];

src = fetchurl {
url = "https://www.freedesktop.org/software/colord/releases/${name}.tar.xz";
sha256 = "0i9y3bb5apj6a0f8cx36l6mjzs7xc0k7nf0magmf58vy2mzhpl18";
url = "https://www.freedesktop.org/software/colord/releases/${pname}-${version}.tar.xz";
sha256 = "05y78jbcbar22sgyhzffhv98dbpl4v6k8j9p807h17y6ighglk1a";
};

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool colord glib gtk3 lcms2 ];
nativeBuildInputs = [
pkgconfig
gettext
meson
ninja
gobject-introspection
gtk-doc
docbook-xsl-ns
docbook_xsl
docbook_xml_dtd_412
libxslt
];

buildInputs = [
glib
lcms2
];

propagatedBuildInputs = [
colord
gtk3
];

meta = {
homepage = http://www.freedesktop.org/software/colord/intro.html;
license = stdenv.lib.licenses.lgpl2Plus;
platforms = stdenv.lib.platforms.linux;
meta = with stdenv.lib; {
homepage = "https://www.freedesktop.org/software/colord/intro.html";
license = licenses.lgpl21Plus;
platforms = platforms.linux;
};
}