diff options
author | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-24 00:15:07 +0700 |
---|---|---|
committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-24 00:16:29 +0700 |
commit | 2f78ee7e816ae39f86bae2e6c61b2d14d3fe3ff4 (patch) | |
tree | fd273f1e48a30237aa9b96342f6324757a4ca09f /pkgs/development/misc/msp430 | |
parent | ec334a1b01c491faa3463c96717b71921dddef2c (diff) |
pkgs/development: stdenv.lib -> lib
Diffstat (limited to 'pkgs/development/misc/msp430')
-rw-r--r-- | pkgs/development/misc/msp430/mspdebug.nix | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/development/misc/msp430/mspdebug.nix b/pkgs/development/misc/msp430/mspdebug.nix index f8616ff0bc4f1..122b3cec4b72c 100644 --- a/pkgs/development/misc/msp430/mspdebug.nix +++ b/pkgs/development/misc/msp430/mspdebug.nix @@ -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"; |