From 0f3a7982e7e73bbc58f86dfed811d51c6206d24a Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 23 Jul 2018 14:13:07 -0400
Subject: [PATCH] libstdcxx5: Move around ahead of other GCC libs being added

---
 .../libraries/{libstdc++5/default.nix => gcc/libstdc++/5.nix}   | 0
 .../libraries/{libstdc++5 => gcc/libstdc++}/no-sys-dirs.patch   | 0
 .../{libstdc++5 => gcc/libstdc++}/struct-ucontext.patch         | 0
 pkgs/top-level/all-packages.nix                                 | 2 +-
 4 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/development/libraries/{libstdc++5/default.nix => gcc/libstdc++/5.nix} (100%)
 rename pkgs/development/libraries/{libstdc++5 => gcc/libstdc++}/no-sys-dirs.patch (100%)
 rename pkgs/development/libraries/{libstdc++5 => gcc/libstdc++}/struct-ucontext.patch (100%)

diff --git a/pkgs/development/libraries/libstdc++5/default.nix b/pkgs/development/libraries/gcc/libstdc++/5.nix
similarity index 100%
rename from pkgs/development/libraries/libstdc++5/default.nix
rename to pkgs/development/libraries/gcc/libstdc++/5.nix
diff --git a/pkgs/development/libraries/libstdc++5/no-sys-dirs.patch b/pkgs/development/libraries/gcc/libstdc++/no-sys-dirs.patch
similarity index 100%
rename from pkgs/development/libraries/libstdc++5/no-sys-dirs.patch
rename to pkgs/development/libraries/gcc/libstdc++/no-sys-dirs.patch
diff --git a/pkgs/development/libraries/libstdc++5/struct-ucontext.patch b/pkgs/development/libraries/gcc/libstdc++/struct-ucontext.patch
similarity index 100%
rename from pkgs/development/libraries/libstdc++5/struct-ucontext.patch
rename to pkgs/development/libraries/gcc/libstdc++/struct-ucontext.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f078a901c8b..d60a52f69de 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8005,7 +8005,7 @@ with pkgs;
 
   librarian-puppet-go = callPackage ../development/tools/librarian-puppet-go { };
 
-  libstdcxx5 = callPackage ../development/libraries/libstdc++5 { };
+  libstdcxx5 = callPackage ../development/libraries/gcc/libstdc++/5.nix { };
 
   libsigrok = callPackage ../development/tools/libsigrok { };
   # old version: