diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-01-05 19:48:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-05 19:48:48 +0100 |
| commit | a7ef0c03d209e0512be9da390c4dcdf2235730f9 (patch) | |
| tree | 336f14eb46db2cd64976d193dcbad3de537fc002 | |
| parent | fdaab47d58865068afc0a1b63b9c3f9486a1e64c (diff) | |
| parent | 9d33aa50fe4f70f23d91b9753dcb660a718bbb34 (diff) | |
| download | nixpkgs-a7ef0c03d209e0512be9da390c4dcdf2235730f9.tar nixpkgs-a7ef0c03d209e0512be9da390c4dcdf2235730f9.tar.gz nixpkgs-a7ef0c03d209e0512be9da390c4dcdf2235730f9.tar.bz2 nixpkgs-a7ef0c03d209e0512be9da390c4dcdf2235730f9.tar.lz nixpkgs-a7ef0c03d209e0512be9da390c4dcdf2235730f9.tar.xz nixpkgs-a7ef0c03d209e0512be9da390c4dcdf2235730f9.tar.zst nixpkgs-a7ef0c03d209e0512be9da390c4dcdf2235730f9.zip | |
Merge pull request #33341 from LnL7/darwin-brotli
brotli: fix darwin build
| -rw-r--r-- | pkgs/tools/compression/brotli/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index 92146f1f178..f4fbb368535 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1rpg16zpr7h6vs7qr6npmqhyw4w5nkp24iq70s4dryn77m0r4mcv"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; outputs = [ "out" "dev" "lib" ]; @@ -21,6 +21,10 @@ stdenv.mkDerivation rec { # and the wonderful bazel BUILD file is already there (yay case-insensitivity?) prePatch = "rm BUILD"; + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + cmakeFlagsArray+=("-DCMAKE_INSTALL_NAME_DIR=$lib/lib") + ''; + meta = with stdenv.lib; { inherit (src.meta) homepage; |