From 4b7ccb341881d1773f250c2a2e3fa6d5cab6d848 Mon Sep 17 00:00:00 2001 From: Evils Date: Wed, 12 Aug 2020 21:16:20 +0200 Subject: [PATCH] stlink: 1.6.0 -> 1.7.0 --- .../development/tools/misc/stlink/default.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix index e67fd9ca7a8..5bad6493c49 100644 --- a/pkgs/development/tools/misc/stlink/default.nix +++ b/pkgs/development/tools/misc/stlink/default.nix @@ -9,25 +9,22 @@ let in stdenv.mkDerivation rec { pname = "stlink"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { - owner = "texane"; + owner = "stlink-org"; repo = "stlink"; rev = "v${version}"; - sha256 = "1mlkrxjxg538335g59hjb0zc739dx4mhbspb26z5gz3lf7d4xv6x"; + sha256 = "03xypffpbp4imrczbxmq69vgkr7mbp0ps9dk815br5wwlz6vgygl"; }; buildInputs = [ libusb1' ]; nativeBuildInputs = [ cmake ]; - patchPhase = '' - sed -i 's@/etc/udev/rules.d@$ENV{out}/etc/udev/rules.d@' CMakeLists.txt - sed -i 's@/etc/modprobe.d@$ENV{out}/etc/modprobe.d@' CMakeLists.txt - ''; - preInstall = '' - mkdir -p $out/etc/udev/rules.d - mkdir -p $out/etc/modprobe.d - ''; + + cmakeFlags = [ + "-DSTLINK_MODPROBED_DIR=${placeholder "out"}/etc/modprobe.d" + "-DSTLINK_UDEV_RULES_DIR=${placeholder "out"}/lib/udev/rules.d" + ]; meta = with lib; { description = "In-circuit debug and programming for ST-Link devices";