From a6f12202d0ed45d32982a6f9cc70786f7814852a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 14 Feb 2020 08:07:38 +0100 Subject: [PATCH] =?UTF-8?q?fwupd:=201.3.7=20=E2=86=92=201.3.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/fwupd/fwupd/compare/1.3.7...1.3.8 --- pkgs/os-specific/linux/firmware/fwupd/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index eac2ed4acd00..aa6aeca9549e 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -2,6 +2,7 @@ { stdenv , fetchurl +, fetchpatch , substituteAll , gtk-doc , pkgconfig @@ -87,11 +88,11 @@ in stdenv.mkDerivation rec { pname = "fwupd"; - version = "1.3.7"; + version = "1.3.8"; src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "02mzn3whk5mba4nxyrkypawr1gzjx79n4nrkhrp8vja6mxxgsf10"; + sha256 = "14hbwp3263n4z61ws62vj50kh9a89fz2l29hyv7f1xlas4zz6j8x"; }; # libfwupd goes to lib @@ -162,6 +163,12 @@ stdenv.mkDerivation rec { # needs a different set of modules than po/make-images inherit installedTestsPython; }) + + # Find the correct lds and crt name when specifying -Defi_ldsdir + (fetchpatch { + url = "https://github.com/fwupd/fwupd/commit/52cda3db9ca9ab4faf99310edf29df926a713b5c.patch"; + sha256 = "0hsj79dzamys7ryz33iwxwd58kb1h7gaw637whm0nkvzkqq6rm16"; + }) ]; postPatch = ''