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

libgcc: use finalAttrs instead of rec

Browse Source
This commit is contained in:
Adam Joseph
2023-08-14 15:08:28 -07:00
parent 72fa5978fd
commit 2ecf2d954b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/gcc/libgcc/default.nix
+5 -5
View File
@@ -3,7 +3,7 @@
, libiberty
}:
stdenvNoLibs.mkDerivation rec {
stdenvNoLibs.mkDerivation (finalAttrs: {
pname = "libgcc";
inherit (gcc.cc) src version;
@@ -138,9 +138,9 @@ stdenvNoLibs.mkDerivation rec {
makeFlags = [ "MULTIBUILDTOP:=../" ];
postInstall = ''
moveToOutput "lib/gcc/${stdenvNoLibs.hostPlatform.config}/${version}/include" "$dev"
moveToOutput "lib/gcc/${stdenvNoLibs.hostPlatform.config}/${finalAttrs.version}/include" "$dev"
mkdir -p "$out/lib" "$dev/include"
ln -s "$out/lib/gcc/${stdenvNoLibs.hostPlatform.config}/${version}"/* "$out/lib"
ln -s "$dev/lib/gcc/${stdenvNoLibs.hostPlatform.config}/${version}/include"/* "$dev/include/"
ln -s "$out/lib/gcc/${stdenvNoLibs.hostPlatform.config}/${finalAttrs.version}"/* "$out/lib"
ln -s "$dev/lib/gcc/${stdenvNoLibs.hostPlatform.config}/${finalAttrs.version}/include"/* "$dev/include/"
'';
}
})