From c2d85c30ae31f9f0d8fb1df15678257047baf4a6 Mon Sep 17 00:00:00 2001 From: bhpdt Date: Mon, 16 Nov 2020 18:42:48 -0500 Subject: [PATCH] woff2: use canonical prefixes When building with a native stdenv, which wraps CC, we need to resolve nix store symlinks when building woff2. --- pkgs/development/web/woff2/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/woff2/default.nix b/pkgs/development/web/woff2/default.nix index ff0484547fc2..d770fb627536 100644 --- a/pkgs/development/web/woff2/default.nix +++ b/pkgs/development/web/woff2/default.nix @@ -18,8 +18,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" ] - ++ stdenv.lib.optional static "-DCMAKE_SKIP_RPATH:BOOL=TRUE"; + cmakeFlags = [ + "-DCANONICAL_PREFIXES=ON" + "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" + ] ++ stdenv.lib.optional static "-DCMAKE_SKIP_RPATH:BOOL=TRUE"; propagatedBuildInputs = [ brotli ];