From 337bc2233cf7c7bfb124cb04b98bc44116188d71 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 8 Jun 2023 17:48:23 +0300 Subject: [PATCH] dirdiff: add darwin support --- pkgs/tools/text/dirdiff/default.nix | 7 ++++++- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/text/dirdiff/default.nix b/pkgs/tools/text/dirdiff/default.nix index 3577242fc0e..437743e66ef 100644 --- a/pkgs/tools/text/dirdiff/default.nix +++ b/pkgs/tools/text/dirdiff/default.nix @@ -23,6 +23,11 @@ stdenv.mkDerivation rec { done ''; + env = { + NIX_CFLAGS_COMPILE = "-DUSE_INTERP_RESULT"; + NIX_LDFLAGS = "-ltcl"; + }; + # If we don't create the directories ourselves, then 'make install' creates # files named 'bin' and 'lib'. preInstall = '' @@ -54,6 +59,6 @@ stdenv.mkDerivation rec { homepage = "https://www.samba.org/ftp/paulus/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ khumba ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68f9f4b56ff..c70f157e220 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6944,10 +6944,7 @@ with pkgs; dsp = callPackage ../tools/audio/dsp { }; - dirdiff = callPackage ../tools/text/dirdiff { - tcl = tcl-8_5; - tk = tk-8_5; - }; + dirdiff = callPackage ../tools/text/dirdiff { }; dwdiff = callPackage ../applications/misc/dwdiff { };