Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f1680774340d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8ae686d1b2b1
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jul 21, 2020

  1. dash: fix compilation on darwin 

    it has been broken since: adbace3
    @adrian-gierakowski
    adrian-gierakowski committed Jul 21, 2020
    Copy the full SHA
    3020abe View commit details

Commits on Jul 27, 2020

  1. Merge pull request #93585 from adrian-gierakowski/fix-dash-on-darwin 

    dash: fix compilation on darwin
    @LnL7
    LnL7 authored Jul 27, 2020
    Copy the full SHA
    8ae686d View commit details
Showing with 46 additions and 1 deletion.
  1. +41 −0 pkgs/shells/dash/0001-fix-dirent64-et-al-on-darwin.patch
  2. +5 −1 pkgs/shells/dash/default.nix
41 changes: 41 additions & 0 deletions pkgs/shells/dash/0001-fix-dirent64-et-al-on-darwin.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
From 7e75779eaeacdbb46a387a59d9aaf1481a1da3e5 Mon Sep 17 00:00:00 2001
From: Adrian Gierakowski <agierakowski@gmail.com>
Date: Sun, 19 Jul 2020 08:38:05 +0100
Subject: [PATCH] fix dirent64 et al on darwin

---
configure.ac | 11 +++++++++++
1 file changed, 11 insertions(+)

diff --git a/configure.ac b/configure.ac
index b8faca9..cee1e4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,6 +139,7 @@ if test "$ac_cv_func_signal" != yes; then
[klibc has bsd_signal instead of signal])])
fi

+dnl TODO: stat64 is deprecated since macOS 10.6
dnl Check for stat64 (dietlibc/klibc).
AC_CHECK_FUNC(stat64,, [
AC_DEFINE(fstat64, fstat, [64-bit operations are the same as 32-bit])
@@ -155,6 +156,16 @@ AC_CHECK_FUNC(open64,, [
AC_DEFINE(open64, open, [64-bit operations are the same as 32-bit])
])

+dnl OS X apparently has stat64 but not readdir64.
+AC_CHECK_FUNC(readdir64,, [
+ AC_DEFINE(readdir64, readdir, [64-bit operations are the same as 32-bit])
+])
+
+dnl OS X apparently has stat64 but not dirent64.
+AC_CHECK_TYPE(struct dirent64,, [
+ AC_DEFINE(dirent64, dirent, [64-bit operations are the same as 32-bit])
+],[#include <dirent.h>])
+
dnl Check if struct stat has st_mtim.
AC_MSG_CHECKING(for stat::st_mtim)
AC_COMPILE_IFELSE(
--
2.15.1

6 changes: 5 additions & 1 deletion pkgs/shells/dash/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl }:
{ autoreconfHook, lib, stdenv, fetchurl }:

stdenv.mkDerivation rec {
name = "dash-0.5.11.1";
@@ -10,6 +10,10 @@ stdenv.mkDerivation rec {

hardeningDisable = [ "format" ];

# Temporary fix until a proper one is accepted upstream
patches = lib.lists.optional stdenv.isDarwin ./0001-fix-dirent64-et-al-on-darwin.patch;
nativeBuildInputs = lib.lists.optional stdenv.isDarwin autoreconfHook;

meta = with stdenv.lib; {
homepage = "http://gondor.apana.org.au/~herbert/dash/";
description = "A POSIX-compliant implementation of /bin/sh that aims to be as small as possible";