JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #46404 from oxij/pkgs/default-texinfo

Browse Source 
git, gpgme: use default texinfo
This commit is contained in:
xeji 2018-09-09 12:04:28 +02:00 committed by GitHub
commit 5870a61b04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/applications/version-management/git-and-tools/default.nix
View File

@ -4,7 +4,6 @@
args @ {config, lib, pkgs}: with args; with pkgs; args @ {config, lib, pkgs}: with args; with pkgs;
let let
gitBase = callPackage ./git { gitBase = callPackage ./git {
texinfo = texinfo5;
svnSupport = false; # for git-svn support svnSupport = false; # for git-svn support
guiSupport = false; # requires tcl/tk guiSupport = false; # requires tcl/tk
sendEmailSupport = false; # requires plenty of perl libraries sendEmailSupport = false; # requires plenty of perl libraries

4
pkgs/development/libraries/gpgme/default.nix
View File

@ -2,7 +2,7 @@
, file, which , file, which
, autoreconfHook , autoreconfHook
, git , git
, texinfo5 , texinfo
, qtbase ? null , qtbase ? null
, withPython ? false, swig2 ? null, python ? null , withPython ? false, swig2 ? null, python ? null
}: }:
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
[ libgpgerror glib libassuan pth ] [ libgpgerror glib libassuan pth ]
++ lib.optional (qtbase != null) qtbase; ++ lib.optional (qtbase != null) qtbase;
nativeBuildInputs = [ file pkgconfig gnupg autoreconfHook git texinfo5 ] nativeBuildInputs = [ file pkgconfig gnupg autoreconfHook git texinfo ]
++ lib.optionals withPython [ python swig2 which ]; ++ lib.optionals withPython [ python swig2 which ];
postPatch ='' postPatch =''