glibc: Use `pname` and `version`

+7 -10
+2 -6
pkgs/development/libraries/glibc/common.nix
··· 32 32 , python3Minimal 33 33 }: 34 34 35 - { name 35 + { pname 36 36 , withLinuxHeaders ? false 37 37 , profilingLibraries ? false 38 38 , withGd ? false ··· 50 50 assert withGd -> gd != null && libpng != null; 51 51 52 52 stdenv.mkDerivation ({ 53 - inherit version; 53 + version = version + patchSuffix; 54 54 linuxHeaders = if withLinuxHeaders then linuxHeaders else null; 55 55 56 56 inherit (stdenv) is64bit; ··· 186 186 # prevent a retained dependency on the bootstrap tools in the stdenv-linux 187 187 # bootstrap. 188 188 BASH_SHELL = "/bin/sh"; 189 - 190 - passthru = { inherit version; }; 191 189 } 192 190 193 191 // (removeAttrs args [ "withLinuxHeaders" "withGd" ]) // 194 192 195 193 { 196 - name = name + "-${version}${patchSuffix}"; 197 - 198 194 src = fetchurl { 199 195 url = "mirror://gnu/glibc/glibc-${version}.tar.xz"; 200 196 inherit sha256;
+1 -1
pkgs/development/libraries/glibc/default.nix
··· 14 14 in 15 15 16 16 callPackage ./common.nix { inherit stdenv; } { 17 - name = "glibc" + lib.optionalString withGd "-gd"; 17 + pname = "glibc" + lib.optionalString withGd "-gd"; 18 18 19 19 inherit withLinuxHeaders profilingLibraries withGd; 20 20
+1 -1
pkgs/development/libraries/glibc/info.nix
··· 1 1 { callPackage, texinfo, perl }: 2 2 3 3 callPackage ./common.nix {} { 4 - name = "glibc-info"; 4 + pname = "glibc-info"; 5 5 6 6 outputs = [ "out" ]; 7 7
+1 -1
pkgs/development/libraries/glibc/locales.nix
··· 11 11 }: 12 12 13 13 callPackage ./common.nix { inherit stdenv; } { 14 - name = "glibc-locales"; 14 + pname = "glibc-locales"; 15 15 16 16 builder = ./locales-builder.sh; 17 17
+2 -1
pkgs/stdenv/linux/default.nix
··· 159 159 # create a dummy Glibc here, which will be used in the stdenv of 160 160 # stage1. 161 161 ${localSystem.libc} = self.stdenv.mkDerivation { 162 - name = "bootstrap-stage0-${localSystem.libc}"; 162 + pname = "bootstrap-stage0-${localSystem.libc}"; 163 + version = "bootstrap"; 163 164 buildCommand = '' 164 165 mkdir -p $out 165 166 ln -s ${bootstrapTools}/lib $out/lib