diff options
author | Daiderd Jordan <daiderd@gmail.com> | 2018-05-28 19:11:29 +0200 |
---|---|---|
committer | Daiderd Jordan <daiderd@gmail.com> | 2018-05-28 19:12:42 +0200 |
commit | 9424d155612c2a4452ca55ada6dad9a668326e93 (patch) | |
tree | 6e68b4e49cc4dfc0fed0c5143c46912aea15f6a8 /pkgs/development/tools/documentation | |
parent | d9e00f8acfa0e535beadbc630bf8c1eac01ce027 (diff) | |
download | nixlib-9424d155612c2a4452ca55ada6dad9a668326e93.tar nixlib-9424d155612c2a4452ca55ada6dad9a668326e93.tar.gz nixlib-9424d155612c2a4452ca55ada6dad9a668326e93.tar.bz2 nixlib-9424d155612c2a4452ca55ada6dad9a668326e93.tar.lz nixlib-9424d155612c2a4452ca55ada6dad9a668326e93.tar.xz nixlib-9424d155612c2a4452ca55ada6dad9a668326e93.tar.zst nixlib-9424d155612c2a4452ca55ada6dad9a668326e93.zip |
gtk-doc: don't use pythonEnv for binaries
Diffstat (limited to 'pkgs/development/tools/documentation')
-rw-r--r-- | pkgs/development/tools/documentation/gtk-doc/default.nix | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index 5bd989a4da88..32025edb3064 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -1,9 +1,6 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, perl, python, libxml2Python, libxslt, which -, docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, dblatex, gettext, itstool }: - -let - pythonEnv = python.withPackages (ps: with ps; [ six ]); -in +, docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, dblatex, gettext, itstool +}: stdenv.mkDerivation rec { name = "gtk-doc-${version}"; @@ -22,11 +19,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = - [ pkgconfig perl pythonEnv libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl - gnome-doc-utils dblatex gettext which itstool - ]; + [ pkgconfig perl python libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl + gnome-doc-utils dblatex gettext which itstool + ]; + + configureFlags = [ "--disable-scrollkeeper" ]; - configureFlags = "--disable-scrollkeeper"; + # Make six available for binaries, python.withPackages creates a wrapper + # but scripts are not allowed in shebangs so we link it into sys.path. + postInstall = '' + ln -s ${python.pkgs.six}/lib/python2.7/site-packages/* $out/share/gtk-doc/python/ + ''; doCheck = false; # requires a lot of stuff doInstallCheck = false; # fails |