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

Merge pull request #74065 from Ericson2314/cc-versions

Browse Source 
compilers, binutils: Add version and pname
This commit is contained in:
John Ericson
2019-11-24 18:35:13 -05:00
committed by GitHub
parent 4f1261134e ef328622e0
commit 6d3b7458cc
23 changed files with 60 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/gcc/4.8/default.nix
+2 -1
View File
@@ -111,7 +111,8 @@ in
assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
stdenv.mkDerivation ({
name = "${crossNameAddon}${name}${if stripped then "" else "-debug"}-${version}";
pname = "${crossNameAddon}${name}${if stripped then "" else "-debug"}";
inherit version;
builder = ../builder.sh;
pkgs/development/compilers/gcc/4.9/default.nix
+2 -1
View File
@@ -116,7 +116,8 @@ in
assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
stdenv.mkDerivation ({
name = "${crossNameAddon}${name}${if stripped then "" else "-debug"}-${version}";
pname = "${crossNameAddon}${name}${if stripped then "" else "-debug"}";
inherit version;
builder = ../builder.sh;
pkgs/development/compilers/gcc/5/default.nix
+2 -1
View File
@@ -107,7 +107,8 @@ in
assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
stdenv.mkDerivation ({
name = "${crossNameAddon}${name}${if stripped then "" else "-debug"}-${version}";
pname = "${crossNameAddon}${name}${if stripped then "" else "-debug"}";
inherit version;
builder = ../builder.sh;
pkgs/development/compilers/gcc/6/default.nix
+2 -1
View File
@@ -103,7 +103,8 @@ in
assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
stdenv.mkDerivation ({
name = "${crossNameAddon}${name}${if stripped then "" else "-debug"}-${version}";
pname = "${crossNameAddon}${name}${if stripped then "" else "-debug"}";
inherit version;
builder = ../builder.sh;
pkgs/development/compilers/gcc/7/default.nix
+2 -1
View File
@@ -78,7 +78,8 @@ let majorVersion = "7";
in
stdenv.mkDerivation ({
name = "${crossNameAddon}${name}${if stripped then "" else "-debug"}-${version}";
pname = "${crossNameAddon}${name}${if stripped then "" else "-debug"}";
inherit version;
builder = ../builder.sh;
pkgs/development/compilers/gcc/8/default.nix
+2 -1
View File
@@ -70,7 +70,8 @@ let majorVersion = "8";
in
stdenv.mkDerivation ({
name = "${crossNameAddon}${name}${if stripped then "" else "-debug"}-${version}";
pname = "${crossNameAddon}${name}${if stripped then "" else "-debug"}";
inherit version;
builder = ../builder.sh;
pkgs/development/compilers/gcc/9/default.nix
+2 -1
View File
@@ -69,7 +69,8 @@ let majorVersion = "9";
in
stdenv.mkDerivation ({
name = "${crossNameAddon}${name}${if stripped then "" else "-debug"}-${version}";
pname = "${crossNameAddon}${name}${if stripped then "" else "-debug"}";
inherit version;
builder = ../builder.sh;
pkgs/development/compilers/gcc/snapshot/default.nix
+2 -1
View File
@@ -66,7 +66,8 @@ let majorVersion = "7";
in
stdenv.mkDerivation ({
name = "${crossNameAddon}${name}${if stripped then "" else "-debug"}-${version}";
pname = "${crossNameAddon}${name}${if stripped then "" else "-debug"}";
inherit version;
builder = ../builder.sh;