From f94a17387c57abb1a32c09812328d1655e98b785 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 17 Dec 2017 09:08:05 +0100 Subject: [PATCH] =?UTF-8?q?efivar:=2030=20=E2=86=92=2034?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/os-specific/linux/firmware/fwupd/default.nix | 4 ++-- pkgs/tools/system/efivar/default.nix | 14 ++++---------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 988f4efb9cd..9deca1faa6a 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -5,12 +5,12 @@ , pillow, ninja, gcab, gnutls, python3Packages, wrapGAppsHook }: let - version = "1.0.1"; + version = "1.0.2"; in stdenv.mkDerivation { name = "fwupd-${version}"; src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "1k627rja7df51dkzqvkzgbwrrj4049k6408d01m34n66zwr2fp59"; + sha256 = "15hrl6jq2kyvbxgjkv3qafqj2962il27gryakm39kvz2p2l1bacj"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix index 6b062513483..7f20e813501 100644 --- a/pkgs/tools/system/efivar/default.nix +++ b/pkgs/tools/system/efivar/default.nix @@ -2,27 +2,21 @@ stdenv.mkDerivation rec { name = "efivar-${version}"; - version = "30"; + version = "34"; src = fetchFromGitHub { owner = "rhinstaller"; repo = "efivar"; rev = version; - sha256 = "1pghj019qr7qpqd9rxfhsr1hm3s0w1hd5cdndpl07vhys8hy4a8a"; + sha256 = "0ycrdaz0ijkm3xb9fnwzhwi0pdj5c6s636wj4i6lbjbrijbzn4x5"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ popt ]; - postPatch = '' - substituteInPlace src/Makefile --replace "-static" "" - ''; - - installFlags = [ + makeFlags = [ + "prefix=$(out)" "libdir=$(out)/lib" - "mandir=$(out)/share/man" - "includedir=$(out)/include" - "bindir=$(out)/bin" ]; meta = with stdenv.lib; {