From 8b4d458ccd7f4e96c5cab8373b28316de9b802a1 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 5 Dec 2018 18:19:19 -0600 Subject: [PATCH 1/2] i2c-tools: 4.0 -> 4.1 https://marc.info/?l=linux-i2c&m=154383448901807&w=2 --- pkgs/os-specific/linux/i2c-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/i2c-tools/default.nix b/pkgs/os-specific/linux/i2c-tools/default.nix index 3f90b91f10d..b3fd34f665e 100644 --- a/pkgs/os-specific/linux/i2c-tools/default.nix +++ b/pkgs/os-specific/linux/i2c-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "i2c-tools-${version}"; - version = "4.0"; + version = "4.1"; src = fetchurl { url = "https://www.kernel.org/pub/software/utils/i2c-tools/${name}.tar.xz"; - sha256 = "1mi8mykvl89y6liinc9jv1x8m2q093wrdc2hm86a47n524fcl06r"; + sha256 = "1m97hpwqfaqjl9xvr4pvz2vdrsdvxbcn0nnx8pamnyc3s7pikcjp"; }; buildInputs = [ perl ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - make install prefix=$out + make install PREFIX=$out rm -rf $out/include # Installs include/linux/i2c-dev.h that conflics with kernel headers ''; From d60806b90bef359a8e654147e7f8c0d39ccd5476 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 31 Dec 2018 11:26:07 -0600 Subject: [PATCH 2/2] i2c-toools: touchups, NFCI. (reviewer suggestions, thanks!) --- pkgs/os-specific/linux/i2c-tools/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/i2c-tools/default.nix b/pkgs/os-specific/linux/i2c-tools/default.nix index b3fd34f665e..5b061183356 100644 --- a/pkgs/os-specific/linux/i2c-tools/default.nix +++ b/pkgs/os-specific/linux/i2c-tools/default.nix @@ -11,13 +11,14 @@ stdenv.mkDerivation rec { buildInputs = [ perl ]; - patchPhase = '' + postPatch = '' substituteInPlace eeprom/decode-edid --replace "/usr/sbin/parse-edid" "${read-edid}/bin/parse-edid" substituteInPlace stub/i2c-stub-from-dump --replace "/sbin/" "" ''; - installPhase = '' - make install PREFIX=$out + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + postInstall = '' rm -rf $out/include # Installs include/linux/i2c-dev.h that conflics with kernel headers '';