From fee7c835876b8b899d8858cdfbf6b4ebbd5681fa Mon Sep 17 00:00:00 2001 From: maj0e <57637846+maj0e@users.noreply.github.com> Date: Wed, 6 Jul 2022 10:01:13 +0200 Subject: [PATCH] cctz: fix static build The install targets were "install_hdrs" and "install_shared_lib". The later is obviously not correct for a static build and was changed to "install_lib" (corresponds to libcctz.a) for that case. --- pkgs/development/libraries/cctz/default.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/cctz/default.nix b/pkgs/development/libraries/cctz/default.nix index aff977edd9123..f1c1a272b5f91 100644 --- a/pkgs/development/libraries/cctz/default.nix +++ b/pkgs/development/libraries/cctz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, darwin }: +{ lib, stdenv, fetchFromGitHub, Foundation }: stdenv.mkDerivation rec { pname = "cctz"; @@ -13,9 +13,11 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Foundation; + buildInputs = lib.optional stdenv.isDarwin Foundation; - installTargets = [ "install_hdrs" "install_shared_lib" ]; + installTargets = [ "install_hdrs" ] + ++ lib.optional (!stdenv.targetPlatform.isStatic) "install_shared_lib" + ++ lib.optional stdenv.targetPlatform.isStatic "install_lib"; postInstall = lib.optionalString stdenv.isDarwin '' install_name_tool -id $out/lib/libcctz.so $out/lib/libcctz.so diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff4932dede771..95625f9dcccb6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17107,7 +17107,9 @@ with pkgs; ccrtp = callPackage ../development/libraries/ccrtp { }; - cctz = callPackage ../development/libraries/cctz { }; + cctz = callPackage ../development/libraries/cctz { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; celt = callPackage ../development/libraries/celt {}; celt_0_7 = callPackage ../development/libraries/celt/0.7.nix {};