From 9775a26da39e72298bae1914ddec24799f80e33f Mon Sep 17 00:00:00 2001 From: Rongcui Dong Date: Sat, 11 Feb 2017 18:44:29 -0800 Subject: [PATCH] stlink: 1.1.0 -> 1.3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [Bjørn: Upstream moved from autotools to cmake.] --- .../development/tools/misc/stlink/default.nix | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix index e52795bf5cde..de13f6709b2b 100644 --- a/pkgs/development/tools/misc/stlink/default.nix +++ b/pkgs/development/tools/misc/stlink/default.nix @@ -1,30 +1,33 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, libusb1 }: +{ stdenv, fetchurl, cmake, libusb1 }: -# IMPORTANT: You need permissions to access the stlink usb devices. Here are -# example udev rules for stlink v1 and v2 so you don't need to have root -# permissions (copied from /49-stlink*.rules): -# -# SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3744", MODE:="0666", SYMLINK+="stlinkv1_%n" -# SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3748", MODE:="0666", SYMLINK+="stlinkv2_%n" +# IMPORTANT: You need permissions to access the stlink usb devices. +# Add services.udev.pkgs = [ pkgs.stlink ] to your configuration.nix let - version = "1.1.0"; + version = "1.3.0"; in stdenv.mkDerivation { name = "stlink-${version}"; src = fetchurl { url = "https://github.com/texane/stlink/archive/${version}.tar.gz"; - sha256 = "0b38a32ids9dpnz5h892l279fz8y1zzqk1qsnyhl1nm03p7xzi1s"; + sha256 = "3e8cba21744d2c38a0557f6835a05189e1b98202931bb0183d22efc462c893dd"; }; - buildInputs = [ autoconf automake libtool pkgconfig libusb1 ]; - preConfigure = "./autogen.sh"; + buildInputs = [ cmake libusb1 ]; + 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 + ''; meta = with stdenv.lib; { description = "In-circuit debug and programming for ST-Link devices"; license = licenses.bsd3; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = [ maintainers.bjornfor maintainers.rongcuid ]; }; }