diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-29 12:59:46 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-11-03 14:00:23 +0100 |
| commit | b4270a7e798940213362a368ae9e1da27adcfb88 (patch) | |
| tree | 399e86a13d68626f577339ef6ec427535b321880 | |
| parent | automake-1.15: deterministic documentation generation (diff) | |
| download | nixpkgs-b4270a7e798940213362a368ae9e1da27adcfb88.tar.gz | |
shadow: replace gnome-doc-utils with itstool
gnome-doc-utils is no longer supported and requires Python 2.
| -rw-r--r-- | pkgs/os-specific/linux/shadow/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index 1a38b804888a..f810270a29e2 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchpatch, fetchFromGitHub, autoreconfHook, libxslt, libxml2 -, docbook_xml_dtd_45, docbook_xsl, gnome-doc-utils, flex, bison +, docbook_xml_dtd_45, docbook_xsl, itstool, flex, bison , pam ? null, glibcCross ? null }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam; nativeBuildInputs = [autoreconfHook libxslt libxml2 - docbook_xml_dtd_45 docbook_xsl gnome-doc-utils flex bison + docbook_xml_dtd_45 docbook_xsl flex bison itstool ]; patches = @@ -38,6 +38,12 @@ stdenv.mkDerivation rec { # Obtain XML resources from XML catalog (patch adapted from gtk-doc) ./respect-xml-catalog-files-var.patch dots_in_usernames + # Allow building with itstool + # https://github.com/shadow-maint/shadow/pull/184 + (fetchpatch { + url = https://github.com/shadow-maint/shadow/commit/6c6c8d3a33bba32277e1ed46f55df1e6dbc914b7.patch; + sha256 = "0xfr1mrfv5xsmri6l7ycbpz3qhs4vf3fyci4kwpffi3icsfjn557"; + }) ]; # The nix daemon often forbids even creating set[ug]id files. |