diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-12-30 09:54:36 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-02 11:29:45 +0100 |
| commit | 1878ac9335e86631a92320ca0c3894f56b278a95 (patch) | |
| tree | 63008f465d634b4195e624ca626a2e9381237f50 /pkgs/development/libraries/kerberos | |
| parent | 072da541de9a00837fc4e21c2bf4a967b4d63713 (diff) | |
| download | nixpkgs-1878ac9335e86631a92320ca0c3894f56b278a95.tar nixpkgs-1878ac9335e86631a92320ca0c3894f56b278a95.tar.gz nixpkgs-1878ac9335e86631a92320ca0c3894f56b278a95.tar.bz2 nixpkgs-1878ac9335e86631a92320ca0c3894f56b278a95.tar.lz nixpkgs-1878ac9335e86631a92320ca0c3894f56b278a95.tar.xz nixpkgs-1878ac9335e86631a92320ca0c3894f56b278a95.tar.zst nixpkgs-1878ac9335e86631a92320ca0c3894f56b278a95.zip | |
tree-wide: various cleanups
It's mainly refactoring and mass-rebuild simplifications without any real impact (besides better readability).
Diffstat (limited to 'pkgs/development/libraries/kerberos')
| -rw-r--r-- | pkgs/development/libraries/kerberos/heimdal.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/kerberos/krb5.nix | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index e17d0c19e03..175d0c7bc3b 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -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 diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index b263a4ef06c..e735285231e 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -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 ]; |