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

Commits on Oct 29, 2019

  1. gtk3: only build docs on linux

    @worldofpeace
    worldofpeace committed Oct 29, 2019
    Copy the full SHA
    b607f1c View commit details

  2. Merge pull request #72269 from worldofpeace/gtk-no-gtk-doc-macos 

    gtk3: only build docs on linux
    @worldofpeace
    worldofpeace authored Oct 29, 2019
    Copy the full SHA
    374e6e9 View commit details
Showing with 7 additions and 5 deletions.
  1. +7 −5 pkgs/development/libraries/gtk/3.x.nix
12 changes: 7 additions & 5 deletions pkgs/development/libraries/gtk/3.x.nix
View file
Original file line number Diff line number Diff line change
@@ -36,6 +36,7 @@
, wayland-protocols
, xineramaSupport ? stdenv.isLinux
, cupsSupport ? stdenv.isLinux
, withGtkDoc ? stdenv.isLinux
, cups ? null
, AppKit
, Cocoa
@@ -49,7 +50,7 @@ stdenv.mkDerivation rec {
pname = "gtk+3";
version = "3.24.12";

outputs = [ "out" "dev" "devdoc" ];
outputs = [ "out" "dev" ] ++ optional withGtkDoc "devdoc";
outputBin = "dev";

setupHooks = [
@@ -81,7 +82,7 @@ stdenv.mkDerivation rec {
separateDebugInfo = stdenv.isLinux;

mesonFlags = [
"-Dgtk_doc=true"
"-Dgtk_doc=${boolToString withGtkDoc}"
"-Dtests=false"
];

@@ -109,10 +110,7 @@ stdenv.mkDerivation rec {
'';

nativeBuildInputs = [
docbook_xml_dtd_43
docbook_xsl
gettext
gtk-doc
gobject-introspection
makeWrapper
meson
@@ -121,6 +119,10 @@ stdenv.mkDerivation rec {
python3
sassc
setupHooks
] ++ optionals withGtkDoc [
docbook_xml_dtd_43
docbook_xsl
gtk-doc
];

buildInputs = [