the-distro/ofborg
2
0
Fork 1
Code Issues 1 Pull requests 1 Packages Projects Releases Wiki Activity

Remove the oldpkgs GLIBC hack

Browse source 
It has been almost three years since this was introduced for the sake of
fixing builds on TravisCI. The project since moved to GitHub Actions and
this shouldn't be required anymore.
This commit is contained in:
Andreas Rammhold 2021-05-16 17:37:05 +02:00 committed by Cole Helbling
parent de74c9e88c
commit b29f146bd7
1 changed files with 4 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
shell.nix
View file

@ -6,17 +6,6 @@
} }: } }:
let let
# A random Nixpkgs revision *before* the default glibc
# was switched to version 2.27.x.
oldpkgsSrc = pkgs.fetchFromGitHub {
owner = "nixos";
repo = "nixpkgs";
rev = "0252e6ca31c98182e841df494e6c9c4fb022c676";
sha256 = "1sr5a11sb26rgs1hmlwv5bxynw2pl5w4h5ic0qv3p2ppcpmxwykz";
};
oldpkgs = import oldpkgsSrc {};
inherit (pkgs) stdenv lib; inherit (pkgs) stdenv lib;
phpEnv = stdenv.mkDerivation rec { phpEnv = stdenv.mkDerivation rec {
@ -35,7 +24,7 @@ let
# HISTFILE = "${src}/.bash_hist"; # HISTFILE = "${src}/.bash_hist";
}; };
mozilla-rust-overlay = stdenv.mkDerivation (rec { mozilla-rust-overlay = stdenv.mkDerivation {
name = "mozilla-rust-overlay"; name = "mozilla-rust-overlay";
buildInputs = with pkgs; [ buildInputs = with pkgs; [
latest.rustChannels.stable.rust latest.rustChannels.stable.rust
@ -66,13 +55,9 @@ let
RUSTFLAGS = "-D warnings"; RUSTFLAGS = "-D warnings";
RUST_BACKTRACE = "1"; RUST_BACKTRACE = "1";
NIX_PATH = "nixpkgs=${pkgs.path}"; NIX_PATH = "nixpkgs=${pkgs.path}";
} };
// lib.optionalAttrs stdenv.isLinux {
LOCALE_ARCHIVE_2_21 = "${oldpkgs.glibcLocales}/lib/locale/locale-archive";
LOCALE_ARCHIVE_2_27 = "${pkgs.glibcLocales}/lib/locale/locale-archive";
});
rustEnv = stdenv.mkDerivation (rec { rustEnv = stdenv.mkDerivation {
name = "gh-event-forwarder"; name = "gh-event-forwarder";
buildInputs = with pkgs; [ buildInputs = with pkgs; [
bash bash
@ -98,10 +83,6 @@ let
NIX_PATH = "nixpkgs=${pkgs.path}"; NIX_PATH = "nixpkgs=${pkgs.path}";
passthru.phpEnv = phpEnv; passthru.phpEnv = phpEnv;
passthru.mozilla-rust-overlay = mozilla-rust-overlay; passthru.mozilla-rust-overlay = mozilla-rust-overlay;
} };
// lib.optionalAttrs stdenv.isLinux {
LOCALE_ARCHIVE_2_21 = "${oldpkgs.glibcLocales}/lib/locale/locale-archive";
LOCALE_ARCHIVE_2_27 = "${pkgs.glibcLocales}/lib/locale/locale-archive";
});
in rustEnv in rustEnv