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

Use some of the library shortcuts

Browse Source
This commit is contained in:
William A. Kennington III 2015-04-21 15:05:00 -07:00
parent 83c781f6fe
commit 7761112e37
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/servers/samba/4.x.nix
View File

@ -13,7 +13,7 @@
, acl ? null
, libaio ? null
, fam ? null
, ceph ? null
, libceph ? null
, glusterfs ? null
# buildtools/wafsamba/wscript optionals
@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
pythonPackages.subunit libbsd nss_wrapper socket_wrapper uid_wrapper
libarchive
kerberos zlib openldap cups pam avahi acl libaio fam ceph glusterfs
kerberos zlib openldap cups pam avahi acl libaio fam libceph glusterfs
libiconv gettext
@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
(mkWith (libarchive != null) "libarchive" null)
(mkWith true "cluster-support" null)
(mkWith (ncurses != null) "regedit" null)
(mkWith ceph "libcephfs" ceph)
(mkWith libceph "libcephfs" libceph)
(mkEnable (glusterfs != null) "glusterfs" null)
# dynconfig/wscript options

4
pkgs/tools/backup/bareos/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, libtool
, readline ? null, openssl ? null, python ? null, ncurses ? null
, sqlite ? null, postgresql ? null, mysql ? null, zlib ? null, lzo ? null
, acl ? null, glusterfs ? null, ceph ? null, libcap ? null
, acl ? null, glusterfs ? null, libceph ? null, libcap ? null
}:
assert sqlite != null || postgresql != null || mysql != null;
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
buildInputs = [
pkgconfig nettools gettext readline openssl python
ncurses sqlite postgresql mysql.lib zlib lzo acl glusterfs ceph libcap
ncurses sqlite postgresql mysql.lib zlib lzo acl glusterfs libceph libcap
];
postPatch = ''

4
pkgs/top-level/all-packages.nix
View File

@ -8620,7 +8620,7 @@ let
cups = if stdenv.isDarwin then null else cups;
pam = if stdenv.isDarwin then null else pam;
libaio = if stdenv.isDarwin then null else libaio;
ceph = if stdenv.isDarwin then null else ceph;
libceph = if stdenv.isDarwin then null else libceph;
glusterfs = if stdenv.isDarwin then null else glusterfs;
dbus = if stdenv.isLinux then dbus else null;
libibverbs = if stdenv.isLinux then libibverbs else null;
@ -8654,7 +8654,7 @@ let
acl = null;
libaio = null;
fam = null;
ceph = null;
libceph = null;
glusterfs = null;
# buildtools/wafsamba/wscript optionals