mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-22 12:53:54 +00:00
folly: reorder inputs to match upstream file
(cherry picked from commit7ae3a8ada6
) (cherry picked from commit383254a33b
)
This commit is contained in:
parent
80dd0dc4e6
commit
4fc612be9d
@ -1,25 +1,29 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
stdenv,
|
stdenv,
|
||||||
|
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
boost,
|
|
||||||
cmake,
|
cmake,
|
||||||
|
pkg-config,
|
||||||
|
|
||||||
|
boost,
|
||||||
double-conversion,
|
double-conversion,
|
||||||
fmt_8,
|
|
||||||
gflags,
|
gflags,
|
||||||
glog,
|
glog,
|
||||||
libevent,
|
libevent,
|
||||||
|
zlib,
|
||||||
|
openssl,
|
||||||
|
xz,
|
||||||
|
lz4,
|
||||||
|
zstd,
|
||||||
libiberty,
|
libiberty,
|
||||||
libunwind,
|
libunwind,
|
||||||
lz4,
|
fmt_8,
|
||||||
openssl,
|
|
||||||
pkg-config,
|
|
||||||
xz,
|
|
||||||
zlib,
|
|
||||||
zstd,
|
|
||||||
jemalloc,
|
jemalloc,
|
||||||
apple-sdk_11,
|
apple-sdk_11,
|
||||||
darwinMinVersionHook,
|
darwinMinVersionHook,
|
||||||
|
|
||||||
follyMobile ? false,
|
follyMobile ? false,
|
||||||
|
|
||||||
# for passthru.tests
|
# for passthru.tests
|
||||||
@ -54,17 +58,17 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
[
|
[
|
||||||
boost
|
boost
|
||||||
double-conversion
|
double-conversion
|
||||||
glog
|
|
||||||
gflags
|
gflags
|
||||||
|
glog
|
||||||
libevent
|
libevent
|
||||||
libiberty
|
|
||||||
openssl
|
|
||||||
lz4
|
|
||||||
xz
|
|
||||||
zlib
|
zlib
|
||||||
|
openssl
|
||||||
|
xz
|
||||||
|
lz4
|
||||||
|
zstd
|
||||||
|
libiberty
|
||||||
libunwind
|
libunwind
|
||||||
fmt_8
|
fmt_8
|
||||||
zstd
|
|
||||||
]
|
]
|
||||||
++ lib.optional stdenv.hostPlatform.isLinux jemalloc
|
++ lib.optional stdenv.hostPlatform.isLinux jemalloc
|
||||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||||
|
Loading…
Reference in New Issue
Block a user