diff options
author | Anthony Roussel <anthony@roussel.dev> | 2023-08-23 15:03:17 +0200 |
---|---|---|
committer | Anthony Roussel <anthony@roussel.dev> | 2023-08-23 15:04:39 +0200 |
commit | 22f6f9163693eac5c0ceacc2c10d81e62c05accb (patch) | |
tree | 6685fae77c039b1f4afda7733592e10a4fc515e3 | |
parent | 9edb077ace8bf9c281a0dfc85351ed2d5c3d2a31 (diff) | |
download | nixpkgs-22f6f9163693eac5c0ceacc2c10d81e62c05accb.tar nixpkgs-22f6f9163693eac5c0ceacc2c10d81e62c05accb.tar.gz nixpkgs-22f6f9163693eac5c0ceacc2c10d81e62c05accb.tar.bz2 nixpkgs-22f6f9163693eac5c0ceacc2c10d81e62c05accb.tar.lz nixpkgs-22f6f9163693eac5c0ceacc2c10d81e62c05accb.tar.xz nixpkgs-22f6f9163693eac5c0ceacc2c10d81e62c05accb.tar.zst nixpkgs-22f6f9163693eac5c0ceacc2c10d81e62c05accb.zip |
rpi-imager: 1.7.4 -> 1.7.5
See https://github.com/raspberrypi/rpi-imager/releases/tag/v1.7.5
-rw-r--r-- | pkgs/tools/misc/rpi-imager/default.nix | 43 | ||||
-rw-r--r-- | pkgs/tools/misc/rpi-imager/lsblkCheckFix.patch | 8 |
2 files changed, 28 insertions, 23 deletions
diff --git a/pkgs/tools/misc/rpi-imager/default.nix b/pkgs/tools/misc/rpi-imager/default.nix index e875d5a5955..7f6b5e79b06 100644 --- a/pkgs/tools/misc/rpi-imager/default.nix +++ b/pkgs/tools/misc/rpi-imager/default.nix @@ -1,31 +1,35 @@ -{ mkDerivation, - stdenv, - lib, - fetchFromGitHub, - cmake, - curl, - libarchive, - util-linux, - qtbase, - qtdeclarative, - qtsvg, - qttools, - qtquickcontrols2, - qtgraphicaleffects +{ lib +, stdenv +, fetchFromGitHub +, wrapQtAppsHook +, cmake +, util-linux +, curl +, libarchive +, qtbase +, qtdeclarative +, qtsvg +, qttools +, qtquickcontrols2 +, qtgraphicaleffects }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "rpi-imager"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitHub { owner = "raspberrypi"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ahETmUhlPZ3jpxmzDK5pS6yLc6UxCJFOtWolAtSrDVQ="; + sha256 = "sha256-yB+H1zWL40KzxOrBuvg7nBC3zmWilsOgOW7ndiDWuDA="; }; - nativeBuildInputs = [ cmake util-linux ]; + nativeBuildInputs = [ + cmake + util-linux + wrapQtAppsHook + ]; buildInputs = [ curl @@ -47,7 +51,8 @@ mkDerivation rec { meta = with lib; { description = "Raspberry Pi Imaging Utility"; - homepage = "https://www.raspberrypi.org/software/"; + homepage = "https://www.raspberrypi.com/software/"; + changelog = "https://github.com/raspberrypi/rpi-imager/releases/tag/v${version}"; downloadPage = "https://github.com/raspberrypi/rpi-imager/"; license = licenses.asl20; maintainers = with maintainers; [ ymarkus ]; diff --git a/pkgs/tools/misc/rpi-imager/lsblkCheckFix.patch b/pkgs/tools/misc/rpi-imager/lsblkCheckFix.patch index 98fd2a659dc..aa4fdeecfdb 100644 --- a/pkgs/tools/misc/rpi-imager/lsblkCheckFix.patch +++ b/pkgs/tools/misc/rpi-imager/lsblkCheckFix.patch @@ -1,16 +1,16 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3d7fc79..8ce72b9 100644 +index 170ce7a..063a137 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -229,11 +229,6 @@ else() +@@ -332,11 +332,6 @@ else() if (NOT LSBLK) message(FATAL_ERROR "Unable to locate lsblk (used for disk enumeration)") endif() - -- execute_process(COMMAND "${LSBLK}" "--json" RESULT_VARIABLE ret) +- execute_process(COMMAND "${LSBLK}" "--json" OUTPUT_QUIET RESULT_VARIABLE ret) - if (ret EQUAL "1") - message(FATAL_ERROR "util-linux package too old. lsblk does not support --json (used for disk enumeration)") - endif() endif() - + configure_file( |