b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

glibc: Use pname and version

Browse source
This commit is contained in:
John Ericson 2021-05-10 15:12:59 +00:00
parent 31d5f234d0
commit 77e97ac4ca
5 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/libraries/glibc/common.nix
View file

@ -32,7 +32,7 @@
, python3Minimal , python3Minimal
}: }:
{ name { pname
, withLinuxHeaders ? false , withLinuxHeaders ? false
, profilingLibraries ? false , profilingLibraries ? false
, withGd ? false , withGd ? false
@ -50,7 +50,7 @@ assert withLinuxHeaders -> linuxHeaders != null;
assert withGd -> gd != null && libpng != null; assert withGd -> gd != null && libpng != null;
stdenv.mkDerivation ({ stdenv.mkDerivation ({
inherit version; version = version + patchSuffix;
linuxHeaders = if withLinuxHeaders then linuxHeaders else null; linuxHeaders = if withLinuxHeaders then linuxHeaders else null;
inherit (stdenv) is64bit; inherit (stdenv) is64bit;
@ -186,15 +186,11 @@ stdenv.mkDerivation ({
# prevent a retained dependency on the bootstrap tools in the stdenv-linux # prevent a retained dependency on the bootstrap tools in the stdenv-linux
# bootstrap. # bootstrap.
BASH_SHELL = "/bin/sh"; BASH_SHELL = "/bin/sh";
passthru = { inherit version; };
} }
// (removeAttrs args [ "withLinuxHeaders" "withGd" ]) // // (removeAttrs args [ "withLinuxHeaders" "withGd" ]) //
{ {
name = name + "-${version}${patchSuffix}";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/glibc/glibc-${version}.tar.xz"; url = "mirror://gnu/glibc/glibc-${version}.tar.xz";
inherit sha256; inherit sha256;

2
pkgs/development/libraries/glibc/default.nix
View file

@ -14,7 +14,7 @@ let
in in
callPackage ./common.nix { inherit stdenv; } { callPackage ./common.nix { inherit stdenv; } {
name = "glibc" + lib.optionalString withGd "-gd"; pname = "glibc" + lib.optionalString withGd "-gd";
inherit withLinuxHeaders profilingLibraries withGd; inherit withLinuxHeaders profilingLibraries withGd;

2
pkgs/development/libraries/glibc/info.nix
View file

@ -1,7 +1,7 @@
{ callPackage, texinfo, perl }: { callPackage, texinfo, perl }:
callPackage ./common.nix {} { callPackage ./common.nix {} {
name = "glibc-info"; pname = "glibc-info";
outputs = [ "out" ]; outputs = [ "out" ];

2
pkgs/development/libraries/glibc/locales.nix
View file

@ -11,7 +11,7 @@
}: }:
callPackage ./common.nix { inherit stdenv; } { callPackage ./common.nix { inherit stdenv; } {
name = "glibc-locales"; pname = "glibc-locales";
builder = ./locales-builder.sh; builder = ./locales-builder.sh;

3
pkgs/stdenv/linux/default.nix
View file

@ -159,7 +159,8 @@ in
# create a dummy Glibc here, which will be used in the stdenv of # create a dummy Glibc here, which will be used in the stdenv of
# stage1. # stage1.
${localSystem.libc} = self.stdenv.mkDerivation { ${localSystem.libc} = self.stdenv.mkDerivation {
name = "bootstrap-stage0-${localSystem.libc}"; pname = "bootstrap-stage0-${localSystem.libc}";
version = "bootstrap";
buildCommand = '' buildCommand = ''
mkdir -p $out mkdir -p $out
ln -s ${bootstrapTools}/lib $out/lib ln -s ${bootstrapTools}/lib $out/lib