From 2e93f5879530e7744ea9d843bce849662ee1d6ac Mon Sep 17 00:00:00 2001 From: Colin Date: Thu, 3 Aug 2023 22:12:10 +0000 Subject: [PATCH] update cross-compilation PR URIs --- nixpatches/list.nix | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/nixpatches/list.nix b/nixpatches/list.nix index 29617ec2..9ab1d950 100644 --- a/nixpatches/list.nix +++ b/nixpatches/list.nix @@ -251,7 +251,7 @@ in [ title = "xdg-utils: enable cross compilation"; prUrl = "https://github.com/NixOS/nixpkgs/pull/246954"; saneCommit = "b7aa5e0c1ec06723cf1594de192703a65be21497"; - hash = "sha256-zT0NYmGhJV24GmfjKj1xKcj9+gRMSOy3504tS/xv6Cw="; + hash = "sha256-jA84RKt4nOEZsBlACaqa0GeBiDdFOBYARgAq4NgTqtY="; }) # (fetchpatch' { # # N.B.: duplicates outstanding, merged PR: @@ -284,14 +284,20 @@ in [ hash = "sha256-Jj+1z2DeCEY+DqI1J4vYjYJwDDMRcA93CqpZSXzG0wE="; }) (fetchpatch' { - # PR also includes the nativeBuildInputs fix - title = "upower: fix cross compilation"; - prUrl = "https://github.com/NixOS/nixpkgs/pull/246945"; - saneCommit = "3ab262456acc016c8dc834df1d1f7e61a00e01e3"; - # hash = "sha256-kTFZVu9oDiYH4W4SoQQj0pNuo9hTJk6jUy+hy34HUtA="; - hash = "sha256-PpC9YRMqg/wPfFgAPNV80mwbZWCKxNi4agxNf0yQutI="; + # alternate fix for upower; Arturrin + title = "upower: Fix cross"; + prUrl = "https://github.com/NixOS/nixpkgs/pull/247031"; + hash = "sha256-Skn1dO+SDXbrWYWn8QpSBzYaTis/KUXLEY+pJxO9pWM="; }) # (fetchpatch' { + # # PR also includes the nativeBuildInputs fix + # title = "upower: fix cross compilation"; + # prUrl = "https://github.com/NixOS/nixpkgs/pull/246945"; + # saneCommit = "3ab262456acc016c8dc834df1d1f7e61a00e01e3"; + # # hash = "sha256-kTFZVu9oDiYH4W4SoQQj0pNuo9hTJk6jUy+hy34HUtA="; + # hash = "sha256-PpC9YRMqg/wPfFgAPNV80mwbZWCKxNi4agxNf0yQutI="; + # }) + # (fetchpatch' { # title = "upower: don't pass unnecessary nativeBuildInputs"; # saneCommit = "e2cbfb1bc81afadc5d31c18d43e774fa9a985f98"; # hash = "sha256-7Q9Fjp7xrw3e887inc5cc01OvuOhThnVYduSLNtv2d0=";