MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #180325 from maj0e/patch-2

Browse source 
pkgsStatic.cctz: fix build
This commit is contained in:
superherointj 2022-09-21 18:08:49 -03:00 committed by GitHub
commit e02ea2e9e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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 { stdenv.mkDerivation rec {
pname = "cctz"; pname = "cctz";
@ -13,9 +13,11 @@ stdenv.mkDerivation rec {
makeFlags = [ "PREFIX=$(out)" ]; 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 '' postInstall = lib.optionalString stdenv.isDarwin ''
install_name_tool -id $out/lib/libcctz.so $out/lib/libcctz.so install_name_tool -id $out/lib/libcctz.so $out/lib/libcctz.so

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

@ -17857,7 +17857,9 @@ with pkgs;
ccrtp = callPackage ../development/libraries/ccrtp { }; 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 = callPackage ../development/libraries/celt {};
celt_0_7 = callPackage ../development/libraries/celt/0.7.nix {}; celt_0_7 = callPackage ../development/libraries/celt/0.7.nix {};