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

tree-wide: various cleanups

Browse Source 
It's mainly refactoring and mass-rebuild simplifications without any
real impact (besides better readability).
This commit is contained in:
Vladimír Čunát
2016-01-02 11:29:45 +01:00
parent 072da541de
commit 1878ac9335
8 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/kerberos/heimdal.nix
+2 -1
View File
@@ -23,7 +23,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkgconfig python perl yacc flex ]
++ (with perlPackages; [ JSON ])
++ optional (!libOnly) texinfo;
buildInputs = (if (!stdenv.isFreeBSD) then [ libcap_ng db ] else []) ++ [ sqlite openssl libedit ]
buildInputs = optionals (!stdenv.isFreeBSD) [ libcap_ng db ]
++ [ sqlite openssl libedit ]
++ optionals (!libOnly) [ openldap pam ];
## ugly, X should be made an option
pkgs/development/libraries/kerberos/krb5.nix
+2 -2
View File
@@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
sha256 = "1sgr61cnkgc5xazijaww6wpn5fnxl9vyj9ixk3r3y7ikv3x0gnyf";
};
configureFlags = stdenv.lib.optionalString stdenv.isFreeBSD ''WARN_CFLAGS=""'';
configureFlags = optional stdenv.isFreeBSD ''WARN_CFLAGS=""'';
nativeBuildInputs = [ pkgconfig perl yacc ]
# Provides the mig command used by the build scripts
++ stdenv.lib.optional stdenv.isDarwin bootstrap_cmds;
++ optional stdenv.isDarwin bootstrap_cmds;
buildInputs = [ openssl ]
++ optionals (!libOnly) [ openldap libedit ];