From bb73bc76a038ff18b6c7a394460ea6dc1da03d6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Fri, 7 Apr 2023 11:09:14 +0200 Subject: [PATCH] nix: bump nixpkgs to include fix for apksigner MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without this fix: https://github.com/NixOS/nixpkgs/commit/d0c06fa3 The `apksigner` utility is unavailable on macOS: ``` error: Package ‘apksigner-33.0.1’ in .../pkgs/development/tools/apksigner/default.nix:86 is not supported on ‘x86_64-darwin’, refusing to evaluate. ``` Signed-off-by: Jakub Sokołowski --- nix/pkgs.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nix/pkgs.nix b/nix/pkgs.nix index 965956b710..8a1d6ddf55 100644 --- a/nix/pkgs.nix +++ b/nix/pkgs.nix @@ -11,10 +11,11 @@ let # We follow the master branch of official nixpkgs. nixpkgsSrc = fetchFromGitHub { name = "nixpkgs-source"; - owner = "status-im"; # FIXME: Fork used to get Cocoapods 1.12.0. + # FIXME: Fork used to get Cocoapods 1.12.0 and apksigner macOS build. + owner = "status-im"; repo = "nixpkgs"; - rev = "b9b2ed705edc00003d47625950602136be3e1ed5"; - sha256 = "sha256-F0qOawdKx7kgiGqwVikYIawL2taJ1XfcgHy0Wn0mho8="; + rev = "d0c06fa3d3982a91aa01bd63ed84020cbde3d3ab"; + sha256 = "sha256-8blvuUHnuf0hFr/PpBxVohJp5CaGXIXhgJlFN/cv7us="; # To get the compressed Nix sha256, use: # nix-prefetch-url --unpack https://github.com/${ORG}/nixpkgs/archive/${REV}.tar.gz };