diff options
author | Florian Klink <flokli@flokli.de> | 2020-04-24 23:55:18 +0200 |
---|---|---|
committer | Florian Klink <flokli@flokli.de> | 2020-04-27 12:19:12 +0200 |
commit | dd03e76f61889409273b1f5527c52092783f6bf4 (patch) | |
tree | 7ab80323fbb5548dc40a62d828159664cb7a9b2e | |
parent | d0e4ecb182bb2edc890c238abc6055701bcadddb (diff) | |
download | nixpkgs-dd03e76f61889409273b1f5527c52092783f6bf4.tar nixpkgs-dd03e76f61889409273b1f5527c52092783f6bf4.tar.gz nixpkgs-dd03e76f61889409273b1f5527c52092783f6bf4.tar.bz2 nixpkgs-dd03e76f61889409273b1f5527c52092783f6bf4.tar.lz nixpkgs-dd03e76f61889409273b1f5527c52092783f6bf4.tar.xz nixpkgs-dd03e76f61889409273b1f5527c52092783f6bf4.tar.zst nixpkgs-dd03e76f61889409273b1f5527c52092783f6bf4.zip |
stlink: inline libusb-static
This is a stlink-specific detail, and doesn't need to be in top-level.nix
-rw-r--r-- | pkgs/development/tools/misc/stlink/default.nix | 10 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix index c59847b1e0f..0aa8d07f765 100644 --- a/pkgs/development/tools/misc/stlink/default.nix +++ b/pkgs/development/tools/misc/stlink/default.nix @@ -1,9 +1,13 @@ { stdenv, fetchFromGitHub, cmake, libusb1 }: -# IMPORTANT: You need permissions to access the stlink usb devices. +let + # The Darwin build of stlink explicitly refers to static libusb. + libusb1' = if stdenv.isDarwin then libusb1.override { withStatic = true; } else libusb1; + +# IMPORTANT: You need permissions to access the stlink usb devices. # Add services.udev.pkgs = [ pkgs.stlink ] to your configuration.nix -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "stlink"; version = "1.6.0"; @@ -14,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "1mlkrxjxg538335g59hjb0zc739dx4mhbspb26z5gz3lf7d4xv6x"; }; - buildInputs = [ cmake libusb1 ]; + 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7050a0b9ba3..d735aa94b7a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14614,10 +14614,7 @@ in stfl = callPackage ../development/libraries/stfl { }; - stlink = callPackage ../development/tools/misc/stlink { - # The Darwin build of stlink explicitly refers to static libusb. - libusb1 = if stdenv.isDarwin then libusb1.override { withStatic = true; } else libusb1; - }; + stlink = callPackage ../development/tools/misc/stlink { }; steghide = callPackage ../tools/security/steghide {}; |