colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cctz: fix static build

Browse Source 
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.
This commit is contained in:
maj0e 2022-07-06 10:01:13 +02:00 committed by majoe
parent 934a622f7e
commit fee7c83587
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/cctz/default.nix
View File

@ -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

4
pkgs/top-level/all-packages.nix
View File

@ -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 {};