JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #236674 from wegank/dirdiff-darwin

Browse Source 
dirdiff: add darwin support
This commit is contained in:
Weijia Wang 2023-06-08 21:45:42 +03:00 committed by GitHub
commit 4f3378eeb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/tools/text/dirdiff/default.nix
View File

@ -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;
};
}

5
pkgs/top-level/all-packages.nix
View File

@ -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 { };