Skip to content

Commit 771daa9

Browse files
committed
gcc-arm-embedded-{13,14}: fix info file causing rebuild error
#363902
1 parent f6b299d commit 771daa9

File tree

4 files changed

+36
-0
lines changed

4 files changed

+36
-0
lines changed
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
--- a/share/info/porting.info
2+
+++ b/share/info/porting.info
3+
@@ -16,9 +16,7 @@ a permission notice identical to this one.
4+
manual into another language, under the above conditions for modified
5+
versions.
6+
START-INFO-DIR-ENTRY
7+
-START-INFO-DIR-ENTRY
8+
* Embed with GNU: (porting-). Embed with GNU
9+
-END-INFO-DIR-ENTRY
10+
END-INFO-DIR-ENTRY
11+
12+
Copyright (C) 1993, 1994, 1995 Cygnus Support

pkgs/by-name/gc/gcc-arm-embedded-13/package.nix

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@ stdenv.mkDerivation rec {
3232
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
3333
};
3434

35+
patches = [
36+
# fix double entry in share/info/porting.info
37+
# https://github.com/NixOS/nixpkgs/issues/363902
38+
./info-fix.patch
39+
];
40+
3541
dontConfigure = true;
3642
dontBuild = true;
3743
dontPatchELF = true;
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
--- a/share/info/porting.info
2+
+++ b/share/info/porting.info
3+
@@ -16,9 +16,7 @@ a permission notice identical to this one.
4+
manual into another language, under the above conditions for modified
5+
versions.
6+
START-INFO-DIR-ENTRY
7+
-START-INFO-DIR-ENTRY
8+
* Embed with GNU: (porting-). Embed with GNU
9+
-END-INFO-DIR-ENTRY
10+
END-INFO-DIR-ENTRY
11+
12+
Copyright (C) 1993, 1994, 1995 Cygnus Support

pkgs/by-name/gc/gcc-arm-embedded-14/package.nix

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ stdenv.mkDerivation rec {
3434
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
3535
};
3636

37+
patches = [
38+
# fix double entry in share/info/porting.info
39+
# https://github.com/NixOS/nixpkgs/issues/363902
40+
./info-fix.patch
41+
];
42+
3743
dontConfigure = true;
3844
dontBuild = true;
3945
dontPatchELF = true;

0 commit comments

Comments
 (0)