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

Commits on Oct 18, 2019

  1. gtk-doc: fix on darwin 

    We can't use shell scripts as shebangs so we drop using .withPackages
and just add pygments to the build env to satiate meson's checks.

#71221 (comment)
    @worldofpeace
    worldofpeace committed Oct 18, 2019
    Copy the full SHA
    62e029c View commit details

  2. Merge pull request #71299 from worldofpeace/fix-gtk-doc-quick 

    gtk-doc: fix on darwin
    @worldofpeace
    worldofpeace authored Oct 18, 2019
    Copy the full SHA
    2417833 View commit details
Showing with 2 additions and 10 deletions.
  1. +2 −10 pkgs/development/tools/documentation/gtk-doc/default.nix
12 changes: 2 additions & 10 deletions pkgs/development/tools/documentation/gtk-doc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,15 +13,6 @@
, withDblatex ? false, dblatex
}:

let

# Needed for https://gitlab.gnome.org/GNOME/gtk-doc/blob/GTK_DOC_1_32/meson.build#L42
python = python3.withPackages (p: with p; [
pygments
]);

in

stdenv.mkDerivation rec {
pname = "gtk-doc";
version = "1.32";
@@ -51,7 +42,8 @@ stdenv.mkDerivation rec {
docbook_xsl
libxslt
pkgconfig
python
python3
python3.pkgs.pygments # Needed for https://gitlab.gnome.org/GNOME/gtk-doc/blob/GTK_DOC_1_32/meson.build#L42
libxml2Python
]
++ stdenv.lib.optional withDblatex dblatex