diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-23 00:03:00 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-23 00:03:00 +0000 |
commit | df9eab6771e440f209b80495b4d5083c068fc64a (patch) | |
tree | 85434c6c746b94ed6d8637041638d58e3cb6992d /pkgs/os-specific/darwin | |
parent | d474c87aff678090f108a23f0b3e521ae0d4e034 (diff) | |
parent | cec3f512d95ba2bd43557f220870f3631a04bfe6 (diff) | |
download | nixpkgs-df9eab6771e440f209b80495b4d5083c068fc64a.tar nixpkgs-df9eab6771e440f209b80495b4d5083c068fc64a.tar.gz nixpkgs-df9eab6771e440f209b80495b4d5083c068fc64a.tar.bz2 nixpkgs-df9eab6771e440f209b80495b4d5083c068fc64a.tar.lz nixpkgs-df9eab6771e440f209b80495b4d5083c068fc64a.tar.xz nixpkgs-df9eab6771e440f209b80495b4d5083c068fc64a.tar.zst nixpkgs-df9eab6771e440f209b80495b4d5083c068fc64a.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific/darwin')
-rw-r--r-- | pkgs/os-specific/darwin/CoreSymbolication/default.nix | 28 | ||||
-rw-r--r-- | pkgs/os-specific/darwin/utm/default.nix | 4 |
2 files changed, 18 insertions, 14 deletions
diff --git a/pkgs/os-specific/darwin/CoreSymbolication/default.nix b/pkgs/os-specific/darwin/CoreSymbolication/default.nix index aa73c7f86c4..5cf92a41a6f 100644 --- a/pkgs/os-specific/darwin/CoreSymbolication/default.nix +++ b/pkgs/os-specific/darwin/CoreSymbolication/default.nix @@ -1,19 +1,23 @@ -{ fetchFromGitHub, stdenv }: +{ lib, fetchFromGitHub, stdenv }: -# Reverse engineered CoreSymbolication to make dtrace buildable - -stdenv.mkDerivation rec { - name = "CoreSymbolication"; +stdenv.mkDerivation { + pname = "core-symbolication"; + version = "unstable-2018-06-17"; src = fetchFromGitHub { - repo = name; + repo = "CoreSymbolication"; owner = "matthewbauer"; - rev = "671fcb66c82eac1827f3f53dc4cc4e9b1b94da0a"; - sha256 = "0qpw46gwgjxiwqqjxksb8yghp2q8dwad6hzaf4zl82xpvk9n5ahj"; + rev = "24c87c23664b3ee05dc7a5a87d647ae476a680e4"; + hash = "sha256-PzvLq94eNhP0+rLwGMKcMzxuD6MlrNI7iT/eV0obtSE="; }; - installPhase = '' - mkdir -p $out/include - cp -r CoreSymbolication $out/include - ''; + makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ]; + + meta = with lib; { + description = "Reverse engineered headers for Apple's CoreSymbolication framework"; + homepage = "https://github.com/matthewbauer/CoreSymbolication"; + license = licenses.mit; + platforms = platforms.darwin; + maintainers = with maintainers; [ matthewbauer ]; + }; } diff --git a/pkgs/os-specific/darwin/utm/default.nix b/pkgs/os-specific/darwin/utm/default.nix index 7ab35aee0b4..f7055d378cb 100644 --- a/pkgs/os-specific/darwin/utm/default.nix +++ b/pkgs/os-specific/darwin/utm/default.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation rec { pname = "utm"; - version = "4.4.3"; + version = "4.4.4"; src = fetchurl { url = "https://github.com/utmapp/UTM/releases/download/v${version}/UTM.dmg"; - hash = "sha256-U1HB8uP8OzHX8LzBE8u7YSDI4vlY9vlMRE+JI+x9rvk="; + hash = "sha256-SyrqkNWRUKQS3D17XYsC/dcCKlPLGNNsG5obEiHE1Lk="; }; nativeBuildInputs = [ undmg makeWrapper ]; |