b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #123505 from stephank/fix-simple-http-server-darwin

Browse source 
simple-http-server: fix darwin build
This commit is contained in:
Pavol Rusnak 2021-05-18 18:45:24 +02:00 committed by GitHub
parent 037e51702e 71ad0ab33d
commit 1a1867b9e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/servers/simple-http-server/default.nix
View file

@ -1,4 +1,4 @@
{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl }:
{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, Security }:
rustPlatform.buildRustPackage rec {
pname = "simple-http-server";
@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
buildInputs = if stdenv.isDarwin then [ Security ] else [ openssl ];
# Currently no tests are implemented, so we avoid building the package twice
doCheck = false;

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

@ -31327,7 +31327,9 @@ in
simplehttp2server = callPackage ../servers/simplehttp2server { };
simple-http-server = callPackage ../servers/simple-http-server { };
simple-http-server = callPackage ../servers/simple-http-server {
inherit (darwin.apple_sdk.frameworks) Security;
};
diceware = with python3Packages; toPythonApplication diceware;