lol

Merge pull request #180325 from maj0e/patch-2

pkgsStatic.cctz: fix build

authored by

superherointj and committed by
GitHub
e02ea2e9 55ebfc59

+8 -4
+5 -3
pkgs/development/libraries/cctz/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, darwin }: 1 + { lib, stdenv, fetchFromGitHub, Foundation }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "cctz"; ··· 13 13 14 14 makeFlags = [ "PREFIX=$(out)" ]; 15 15 16 - buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Foundation; 16 + buildInputs = lib.optional stdenv.isDarwin Foundation; 17 17 18 - installTargets = [ "install_hdrs" "install_shared_lib" ]; 18 + installTargets = [ "install_hdrs" ] 19 + ++ lib.optional (!stdenv.targetPlatform.isStatic) "install_shared_lib" 20 + ++ lib.optional stdenv.targetPlatform.isStatic "install_lib"; 19 21 20 22 postInstall = lib.optionalString stdenv.isDarwin '' 21 23 install_name_tool -id $out/lib/libcctz.so $out/lib/libcctz.so
+3 -1
pkgs/top-level/all-packages.nix
··· 17857 17857 17858 17858 ccrtp = callPackage ../development/libraries/ccrtp { }; 17859 17859 17860 - cctz = callPackage ../development/libraries/cctz { }; 17860 + cctz = callPackage ../development/libraries/cctz { 17861 + inherit (darwin.apple_sdk.frameworks) Foundation; 17862 + }; 17861 17863 17862 17864 celt = callPackage ../development/libraries/celt {}; 17863 17865 celt_0_7 = callPackage ../development/libraries/celt/0.7.nix {};