diff options
| author | Shawn8901 <shawn8901@googlemail.com> | 2023-01-26 18:31:02 +0100 |
|---|---|---|
| committer | Shawn8901 <shawn8901@googlemail.com> | 2023-01-26 18:31:02 +0100 |
| commit | a59dda942cbe3d40c1ae424d4d8a6db715cac0d5 (patch) | |
| tree | c4d7e17a260da0a29c9690de071787d3ca62b3d2 /pkgs/development/tools/iaca | |
| parent | aedc95590cdc13e99441684b7aca81cdbfa542ad (diff) | |
treewide: remove global with lib; statements in pkgs/development
Diffstat (limited to 'pkgs/development/tools/iaca')
| -rw-r--r-- | pkgs/development/tools/iaca/2.1.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/tools/iaca/3.0.nix | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/development/tools/iaca/2.1.nix b/pkgs/development/tools/iaca/2.1.nix index 6695716aa67f9..584b8856e89fc 100644 --- a/pkgs/development/tools/iaca/2.1.nix +++ b/pkgs/development/tools/iaca/2.1.nix @@ -1,5 +1,4 @@ { lib, stdenv, makeWrapper, requireFile, gcc, unzip }: -with lib; # v2.1: last version with NHM/WSM arch support stdenv.mkDerivation rec { @@ -17,17 +16,17 @@ stdenv.mkDerivation rec { cp bin/iaca $out/bin/ cp lib/* $out/lib ''; - preFixup = let libPath = makeLibraryPath [ stdenv.cc.cc.lib gcc ]; in '' + preFixup = let libPath = lib.makeLibraryPath [ stdenv.cc.cc.lib gcc ]; in '' patchelf \ --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 \ --set-rpath $out/lib:"${libPath}" \ $out/bin/iaca ''; postFixup = "wrapProgram $out/bin/iaca --set LD_LIBRARY_PATH $out/lib"; - meta = { + meta = with lib; { description = "Intel Architecture Code Analyzer"; homepage = "https://software.intel.com/en-us/articles/intel-architecture-code-analyzer/"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ kazcw ]; diff --git a/pkgs/development/tools/iaca/3.0.nix b/pkgs/development/tools/iaca/3.0.nix index b5ad92cc08219..1c0a4f5460fd5 100644 --- a/pkgs/development/tools/iaca/3.0.nix +++ b/pkgs/development/tools/iaca/3.0.nix @@ -1,5 +1,4 @@ { lib, stdenv, requireFile, unzip }: -with lib; stdenv.mkDerivation rec { pname = "iaca"; @@ -15,10 +14,10 @@ stdenv.mkDerivation rec { cp iaca $out/bin patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 $out/bin/iaca ''; - meta = { + meta = with lib; { description = "Intel Architecture Code Analyzer"; homepage = "https://software.intel.com/en-us/articles/intel-architecture-code-analyzer/"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ kazcw ]; |