From d00f200f4eeb3085368693618fda2a1110eec3af Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 12 Feb 2018 14:06:17 -0600
Subject: bootstrap-files: nicer naming

---
 pkgs/stdenv/linux/bootstrap-files/musl64.nix      | 10 ----------
 pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix | 10 ++++++++++
 pkgs/stdenv/linux/default.nix                     |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 100644 pkgs/stdenv/linux/bootstrap-files/musl64.nix
 create mode 100644 pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix

(limited to 'pkgs/stdenv')

diff --git a/pkgs/stdenv/linux/bootstrap-files/musl64.nix b/pkgs/stdenv/linux/bootstrap-files/musl64.nix
deleted file mode 100644
index 65deff26c420..000000000000
--- a/pkgs/stdenv/linux/bootstrap-files/musl64.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Use busybox for i686-linux since it works on x86_64-linux as well.
-(import ./i686.nix) //
-
-{
-  bootstrapTools = import <nix/fetchurl.nix> {
-    # XXX: Find a permanent location for this
-    url = https://wdtz.org/files/5zfs7s729n4lrlxmhlnc6qmfrlhahy9s-stdenv-bootstrap-tools-x86_64-unknown-linux-musl/on-server/bootstrap-tools.tar.xz;
-    sha256 = "0lwi08c2v7ip2z9li597ixywix976561hr358z2fbd6sqi943axl";
-  };
-}
diff --git a/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix b/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix
new file mode 100644
index 000000000000..65deff26c420
--- /dev/null
+++ b/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix
@@ -0,0 +1,10 @@
+# Use busybox for i686-linux since it works on x86_64-linux as well.
+(import ./i686.nix) //
+
+{
+  bootstrapTools = import <nix/fetchurl.nix> {
+    # XXX: Find a permanent location for this
+    url = https://wdtz.org/files/5zfs7s729n4lrlxmhlnc6qmfrlhahy9s-stdenv-bootstrap-tools-x86_64-unknown-linux-musl/on-server/bootstrap-tools.tar.xz;
+    sha256 = "0lwi08c2v7ip2z9li597ixywix976561hr358z2fbd6sqi943axl";
+  };
+}
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 2baa8c0479ce..8a8e52d1dfb6 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -18,7 +18,7 @@
       "mips64el-linux" = import ./bootstrap-files/loongson2f.nix;
     };
     "musl" = {
-      "x86_64-linux" = import ./bootstrap-files/musl64.nix;
+      "x86_64-linux" = import ./bootstrap-files/x86_64-musl.nix;
     };
   };
   archLookupTable = table.${localSystem.libc}
-- 
cgit 1.4.1