public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkgs/development: stdenv.lib -> lib

Browse Source
This commit is contained in:
Ben Siraphob
2021-01-24 00:15:07 +07:00
parent ec334a1b01
commit 2f78ee7e81
121 changed files with 324 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/misc/msp430/mspdebug.nix
View File

@@ -25,13 +25,13 @@ stdenv.mkDerivation rec {
};
enableParallelBuilding = true;
nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin pkg-config
++ stdenv.lib.optional (enableMspds && stdenv.isLinux) autoPatchelfHook;
nativeBuildInputs = lib.optional stdenv.isDarwin pkg-config
++ lib.optional (enableMspds && stdenv.isLinux) autoPatchelfHook;
buildInputs = [ libusb-compat-0_1 ]
++ stdenv.lib.optional stdenv.isDarwin hidapi
++ stdenv.lib.optional enableReadline readline;
++ lib.optional stdenv.isDarwin hidapi
++ lib.optional enableReadline readline;
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
postPatch = lib.optionalString stdenv.isDarwin ''
# TODO: remove once a new 0.26+ release is made
substituteInPlace drivers/tilib_api.c --replace .so ${stdenv.hostPlatform.extensions.sharedLibrary}
@@ -40,8 +40,8 @@ stdenv.mkDerivation rec {
'';
# TODO: wrap with MSPDEBUG_TILIB_PATH env var instead of these rpath fixups in 0.26+
runtimeDependencies = stdenv.lib.optional enableMspds mspds;
postFixup = stdenv.lib.optionalString (enableMspds && stdenv.isDarwin) ''
runtimeDependencies = lib.optional enableMspds mspds;
postFixup = lib.optionalString (enableMspds && stdenv.isDarwin) ''
# autoPatchelfHook only works on linux so...
for dep in $runtimeDependencies; do
install_name_tool -add_rpath $dep/lib $out/bin/$pname
@@ -50,8 +50,8 @@ stdenv.mkDerivation rec {
installFlags = [ "PREFIX=$(out)" "INSTALL=install" ];
makeFlags = [ "UNAME_S=$(unameS)" ] ++
stdenv.lib.optional (!enableReadline) "WITHOUT_READLINE=1";
unameS = stdenv.lib.optionalString stdenv.isDarwin "Darwin";
lib.optional (!enableReadline) "WITHOUT_READLINE=1";
unameS = lib.optionalString stdenv.isDarwin "Darwin";
meta = with lib; {
description = "A free programmer, debugger, and gdb proxy for MSP430 MCUs";