1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 21:50:55 +00:00

Merge pull request #115756 from siraben/darwin-mass-fix-buildInputs=0

This commit is contained in:
Sandro 2021-03-16 12:42:46 +01:00 committed by GitHub
commit bd38cc9dbc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 29 additions and 22 deletions

View file

@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
description = "Tiny but powerful single file wavefront obj loader"; description = "Tiny but powerful single file wavefront obj loader";
license = licenses.mit; license = licenses.mit;
maintainers = [ maintainers.ivar ]; maintainers = [ maintainers.ivar ];
platforms = platforms.linux; platforms = platforms.all;
}; };
} }

View file

@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ fionera AndersonTorres ]; maintainers = with maintainers; [ fionera AndersonTorres ];
platforms = with platforms; linux; platforms = platforms.all;
}; };
} }

View file

@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
description = "UTF-8 with C++ in a Portable Way"; description = "UTF-8 with C++ in a Portable Way";
license = licenses.free; license = licenses.free;
maintainers = with maintainers; [ jobojeha ]; maintainers = with maintainers; [ jobojeha ];
platforms = platforms.linux; platforms = platforms.all;
}; };
} }

View file

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
homepage = "http://vcg.isti.cnr.it/vcglib/install.html"; homepage = "http://vcg.isti.cnr.it/vcglib/install.html";
description = "C++ library for manipulation, processing and displaying with OpenGL of triangle and tetrahedral meshes"; description = "C++ library for manipulation, processing and displaying with OpenGL of triangle and tetrahedral meshes";
license = licenses.gpl3; license = licenses.gpl3;
platforms = platforms.linux; platforms = platforms.all;
maintainers = with maintainers; [ abbradar ]; maintainers = with maintainers; [ abbradar ];
}; };
} }

View file

@ -27,6 +27,6 @@ stdenv.mkDerivation {
description = "Creates a graph of dependencies from GNU-Make; Output is a graphiz-dot file or a Gexf-XML file"; description = "Creates a graph of dependencies from GNU-Make; Output is a graphiz-dot file or a Gexf-XML file";
maintainers = with maintainers; [ cmcdragonkai ]; maintainers = with maintainers; [ cmcdragonkai ];
license = licenses.mit; license = licenses.mit;
platforms = platforms.linux; platforms = platforms.all;
}; };
} }

View file

@ -19,7 +19,7 @@ stdenv.mkDerivation {
description = "Verification script generator for Spin"; description = "Verification script generator for Spin";
homepage = "http://spinroot.com/"; homepage = "http://spinroot.com/";
license = licenses.free; license = licenses.free;
platforms = platforms.linux; platforms = platforms.unix;
maintainers = with maintainers; [ abbradar ]; maintainers = with maintainers; [ abbradar ];
}; };
} }

View file

@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/RadeonOpenCompute/rocm-cmake"; homepage = "https://github.com/RadeonOpenCompute/rocm-cmake";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ danieldk ]; maintainers = with maintainers; [ danieldk ];
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

View file

@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/foldex/r2mod_cli"; homepage = "https://github.com/foldex/r2mod_cli";
license = licenses.gpl3Only; license = licenses.gpl3Only;
maintainers = [ maintainers.reedrw ]; maintainers = [ maintainers.reedrw ];
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

View file

@ -21,7 +21,7 @@ stdenv.mkDerivation {
back to data on the other side. back to data on the other side.
''; '';
license = licenses.mit; license = licenses.mit;
platforms = platforms.linux; platforms = platforms.all;
maintainers = [ maintainers.cstrahan ]; maintainers = [ maintainers.cstrahan ];
}; };
} }

View file

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/roehling/postsrsd"; homepage = "https://github.com/roehling/postsrsd";
description = "Postfix Sender Rewriting Scheme daemon"; description = "Postfix Sender Rewriting Scheme daemon";
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.linux; platforms = platforms.all;
maintainers = with maintainers; [ abbradar ]; maintainers = with maintainers; [ abbradar ];
}; };
} }

View file

@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
}; };
postPatch = '' postPatch = ''
sed -e "s|/usr||g" -i Makefile substituteInPlace Makefile --replace "/usr" ""
substituteInPlace Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc"
''; '';
makeFlags = [ "DESTDIR=$(out)" "BINDIR=/bin" ]; makeFlags = [ "DESTDIR=$(out)" "BINDIR=/bin" ];
@ -39,6 +40,6 @@ stdenv.mkDerivation rec {
homepage = "http://p910nd.sourceforge.net/"; homepage = "http://p910nd.sourceforge.net/";
downloadPage = "https://sourceforge.net/projects/p910nd/"; downloadPage = "https://sourceforge.net/projects/p910nd/";
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

View file

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, rustPlatform }: { stdenv, lib, fetchFromGitHub, rustPlatform, Security }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "routinator"; pname = "routinator";
@ -11,6 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-JwPAwhD+Pkx8Kx24m7z/RbEvDnI2YR8dnTgAV7TMsFE="; sha256 = "sha256-JwPAwhD+Pkx8Kx24m7z/RbEvDnI2YR8dnTgAV7TMsFE=";
}; };
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
cargoSha256 = "sha256-lhSSyJxxHc0t43xoDMtr/lSVL0xZl6poPYiyYXNvKKQ="; cargoSha256 = "sha256-lhSSyJxxHc0t43xoDMtr/lSVL0xZl6poPYiyYXNvKKQ=";
meta = with lib; { meta = with lib; {
@ -18,6 +19,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/NLnetLabs/routinator"; homepage = "https://github.com/NLnetLabs/routinator";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ _0x4A6F ]; maintainers = with maintainers; [ _0x4A6F ];
platforms = platforms.linux; platforms = platforms.all;
}; };
} }

View file

@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
description = "A lightweight UDP torrent tracker"; description = "A lightweight UDP torrent tracker";
homepage = "https://naim94a.github.io/udpt"; homepage = "https://naim94a.github.io/udpt";
license = lib.licenses.gpl3; license = lib.licenses.gpl3;
platforms = lib.platforms.linux; platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ makefu ]; maintainers = with lib.maintainers; [ makefu ];
}; };
} }

View file

@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
license = licenses.osl3; license = licenses.osl3;
homepage = "https://restya.com"; homepage = "https://restya.com";
maintainers = with maintainers; [ tstrobel ]; maintainers = with maintainers; [ tstrobel ];
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

View file

@ -19,7 +19,7 @@ stdenv.mkDerivation {
description = "A ZSH theme optimized for people who use Git & Unicode-compatible fonts and terminals"; description = "A ZSH theme optimized for people who use Git & Unicode-compatible fonts and terminals";
homepage = "https://github.com/halfo/lambda-mod-zsh-theme/"; homepage = "https://github.com/halfo/lambda-mod-zsh-theme/";
license = licenses.mit; license = licenses.mit;
platforms = platforms.linux; platforms = platforms.all;
maintainers = with maintainers; [ ma27 ]; maintainers = with maintainers; [ ma27 ];
}; };
} }

View file

@ -11,10 +11,11 @@ stdenv.mkDerivation rec {
sha256 = "15hi8kfknldwpvm885r9s7zd5h7cirs7x0zazx2nnz62xvz3iymk"; sha256 = "15hi8kfknldwpvm885r9s7zd5h7cirs7x0zazx2nnz62xvz3iymk";
}; };
configurePhase = '' postPatch = ''
sed -i src/anlghead.h \ sed -i src/anlghead.h \
-e "s|#define DEFAULTCONFIGFILE .*|#define DEFAULTCONFIGFILE \"$out/etc/analog.cfg\"|g" \ -e "s|#define DEFAULTCONFIGFILE .*|#define DEFAULTCONFIGFILE \"$out/etc/analog.cfg\"|g" \
-e "s|#define LANGDIR .*|#define LANGDIR \"$out/share/$pname}/lang/\"|g" -e "s|#define LANGDIR .*|#define LANGDIR \"$out/share/$pname}/lang/\"|g"
substituteInPlace src/Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc"
''; '';
installPhase = '' installPhase = ''
@ -32,7 +33,7 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl2; license = lib.licenses.gpl2;
description = "Powerful tool to generate web server statistics"; description = "Powerful tool to generate web server statistics";
maintainers = [ lib.maintainers.peti ]; maintainers = [ lib.maintainers.peti ];
platforms = lib.platforms.linux; platforms = lib.platforms.all;
}; };
} }

View file

@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
}; };
postPatch = '' postPatch = ''
substituteInPlace Makefile --replace /usr/local $out substituteInPlace Makefile \
--replace /usr/local $out \
--replace gcc "${stdenv.cc.targetPrefix}cc"
''; '';
meta = with lib; { meta = with lib; {
@ -17,6 +19,6 @@ stdenv.mkDerivation rec {
homepage = "http://www.fourmilab.ch/webtools/midicsv/"; homepage = "http://www.fourmilab.ch/webtools/midicsv/";
license = licenses.publicDomain; license = licenses.publicDomain;
maintainers = with maintainers; [ orivej ]; maintainers = with maintainers; [ orivej ];
platforms = platforms.linux; platforms = platforms.all;
}; };
} }

View file

@ -2887,7 +2887,9 @@ in
roundcubePlugins = dontRecurseIntoAttrs (callPackage ../servers/roundcube/plugins { }); roundcubePlugins = dontRecurseIntoAttrs (callPackage ../servers/roundcube/plugins { });
routinator = callPackage ../servers/routinator { }; routinator = callPackage ../servers/routinator {
inherit (darwin.apple_sdk.frameworks) Security;
};
rsbep = callPackage ../tools/backup/rsbep { }; rsbep = callPackage ../tools/backup/rsbep { };