cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #241305 from afh/drawin-fdm-tdb

Browse source 
Enable Darwin for fdm and fix tdb install name
This commit is contained in:
Weijia Wang 2023-07-06 15:20:10 +03:00 committed by GitHub
commit 5daaa32204
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/libraries/tdb/default.nix
View file

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://samba/tdb/${pname}-${version}.tar.gz"; url = "mirror://samba/tdb/${pname}-${version}.tar.gz";
sha256 = "sha256-hDTJyFfRPOP6hGb3VgHyXDaTZ2s2kZ8VngrWEhuvXOg="; hash = "sha256-hDTJyFfRPOP6hGb3VgHyXDaTZ2s2kZ8VngrWEhuvXOg=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -48,6 +48,10 @@ stdenv.mkDerivation rec {
"--builtin-libraries=replace" "--builtin-libraries=replace"
]; ];
postFixup = if stdenv.isDarwin
then ''install_name_tool -id $out/lib/libtdb.dylib $out/lib/libtdb.dylib''
else null;
# python-config from build Python gives incorrect values when cross-compiling. # python-config from build Python gives incorrect values when cross-compiling.
# If python-config is not found, the build falls back to using the sysconfig # If python-config is not found, the build falls back to using the sysconfig
# module, which works correctly in all cases. # module, which works correctly in all cases.

5
pkgs/tools/networking/fdm/default.nix
View file

@ -8,17 +8,16 @@ stdenv.mkDerivation rec {
owner = "nicm"; owner = "nicm";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-Gqpz+N1ELU5jQpPJAG9s8J9UHWOJNhkT+s7+xuQazd0="; hash = "sha256-Gqpz+N1ELU5jQpPJAG9s8J9UHWOJNhkT+s7+xuQazd0=";
}; };
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ openssl tdb zlib flex bison ]; buildInputs = [ openssl tdb zlib flex bison ];
meta = with lib; { meta = with lib; {
description = "Mail fetching and delivery tool - should do the job of getmail and procmail"; description = "Mail fetching and delivery tool - should do the job of getmail and procmail";
maintainers = with maintainers; [ raskin ]; maintainers = with maintainers; [ raskin ];
platforms = with platforms; linux; platforms = with platforms; linux ++ darwin;
homepage = "https://github.com/nicm/fdm"; homepage = "https://github.com/nicm/fdm";
downloadPage = "https://github.com/nicm/fdm/releases"; downloadPage = "https://github.com/nicm/fdm/releases";
license = licenses.isc; license = licenses.isc;