alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #123479 from stephank/fix-pactorio-darwin

Browse source 
pactorio: fix darwin build
This commit is contained in:
Sandro 2021-05-18 13:01:11 +02:00 committed by GitHub
parent ab040108fb 049d5a7219
commit 10d2be7d5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/tools/pactorio/default.nix
View file

@ -1,4 +1,4 @@
{ fetchFromGitHub, installShellFiles, lib, rustPlatform }: { fetchFromGitHub, installShellFiles, lib, stdenv, rustPlatform, Security }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "pactorio"; pname = "pactorio";
@ -14,6 +14,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "1m7bvi6i52xqvssjx5fr2dz25ny7hkmb8w8p23pczpdmpd2y0r7r"; cargoSha256 = "1m7bvi6i52xqvssjx5fr2dz25ny7hkmb8w8p23pczpdmpd2y0r7r";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optional stdenv.isDarwin Security;
preFixup = '' preFixup = ''
completions=($releaseDir/build/pactorio-*/out/completions) completions=($releaseDir/build/pactorio-*/out/completions)

4
pkgs/top-level/all-packages.nix
View file

@ -13452,7 +13452,9 @@ in
libiberty_static = libiberty.override { staticBuild = true; }; libiberty_static = libiberty.override { staticBuild = true; };
}; };
pactorio = callPackage ../development/tools/pactorio { }; pactorio = callPackage ../development/tools/pactorio {
inherit (darwin.apple_sdk.frameworks) Security;
};
pahole = callPackage ../development/tools/misc/pahole {}; pahole = callPackage ../development/tools/misc/pahole {};