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: eae4965117a7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 91a2ad21adcc
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Mar 6, 2018

  1. gnome3.gtksourceview: enable parallel building

    @abbradar
    abbradar committed Mar 6, 2018
    Copy the full SHA
    8529e0b View commit details

  2. twemoji-color-font: include recommended fontconfig configuration

    @abbradar
    abbradar committed Mar 6, 2018
    Copy the full SHA
    fe708a3 View commit details

  3. gtkmm2: enable parallel building

    @abbradar
    abbradar committed Mar 6, 2018
    Copy the full SHA
    91a2ad2 View commit details
Showing with 12 additions and 2 deletions.
  1. +5 −1 pkgs/data/fonts/twemoji-color-font/default.nix
  2. +4 −0 pkgs/desktops/gnome-3/core/gtksourceview/default.nix
  3. +3 −1 pkgs/development/libraries/gtkmm/2.x.nix
6 changes: 5 additions & 1 deletion pkgs/data/fonts/twemoji-color-font/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,11 @@ stdenv.mkDerivation rec {
preBuild = "export HOME=\"$NIX_BUILD_ROOT\"";
makeFlags = [ "SCFBUILD=${scfbuild}/bin/scfbuild" ];
enableParallelBuilding = true;
installPhase = "install -Dm755 build/TwitterColorEmoji-SVGinOT.ttf $out/share/fonts/truetype/TwitterColorEmoji-SVGinOT.ttf";

installPhase = ''
install -Dm755 build/TwitterColorEmoji-SVGinOT.ttf $out/share/fonts/truetype/TwitterColorEmoji-SVGinOT.ttf
install -Dm644 linux/fontconfig/56-twemoji-color.conf $out/etc/fonts/conf.d/56-twemoji-color.conf
'';

meta = with stdenv.lib; {
version = "1.3";
4 changes: 4 additions & 0 deletions pkgs/desktops/gnome-3/core/gtksourceview/default.nix
View file
Original file line number Diff line number Diff line change
@@ -36,6 +36,8 @@ in stdenv.mkDerivation rec {

patches = [ ./nix_share_path.patch ];

enableParallelBuilding = true;

doCheck = stdenv.isLinux;
checkPhase = ''
export NO_AT_BRIDGE=1
@@ -45,7 +47,9 @@ in stdenv.mkDerivation rec {
'';

meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Projects/GtkSourceView;
platforms = with platforms; linux ++ darwin;
license = licenses.lgpl21;
maintainers = gnome3.maintainers;
};
}
4 changes: 3 additions & 1 deletion pkgs/development/libraries/gtkmm/2.x.nix
View file
Original file line number Diff line number Diff line change
@@ -11,12 +11,14 @@ stdenv.mkDerivation rec {

outputs = [ "out" "dev" ];

nativeBuildInputs = [pkgconfig];
nativeBuildInputs = [ pkgconfig ];

propagatedBuildInputs = [ glibmm gtk2 atkmm cairomm pangomm ];

doCheck = true;

enableParallelBuilding = true;

meta = {
description = "C++ interface to the GTK+ graphical user interface library";