diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-04-21 15:05:00 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-04-21 20:59:42 -0700 |
| commit | 7761112e37b001d33148c36e0226d3b99f0367a9 (patch) | |
| tree | fd054f28354ca8445ae58c4273df2c4669298e6b | |
| parent | 83c781f6fedbdc3dc6710bba356240845946d4ce (diff) | |
| download | nixpkgs-7761112e37b001d33148c36e0226d3b99f0367a9.tar nixpkgs-7761112e37b001d33148c36e0226d3b99f0367a9.tar.gz nixpkgs-7761112e37b001d33148c36e0226d3b99f0367a9.tar.bz2 nixpkgs-7761112e37b001d33148c36e0226d3b99f0367a9.tar.lz nixpkgs-7761112e37b001d33148c36e0226d3b99f0367a9.tar.xz nixpkgs-7761112e37b001d33148c36e0226d3b99f0367a9.tar.zst nixpkgs-7761112e37b001d33148c36e0226d3b99f0367a9.zip | |
Use some of the library shortcuts
| -rw-r--r-- | pkgs/servers/samba/4.x.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/backup/bareos/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 3a2e46daa34..49b81794f04 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -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 diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index 55c84a1015f..8433a67c5c4 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -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 = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef0b17618a9..af2c69ec504 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 |