diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-19 12:43:52 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-19 12:43:52 +0000 |
| commit | 1d26caa746f7eda613c5e87342889e55b9e5ba96 (patch) | |
| tree | 9d43a122bbf9f02687afad5b4b634bde310dbf5e /pkgs/development/interpreters/pixie/default.nix | |
| parent | 896a18112460f3b7a67576dde0142cd37d6bab50 (diff) | |
| parent | 7de82fbe61b3fd1854fc4a89a1ab4ed6fad812e3 (diff) | |
| download | nixpkgs-1d26caa746f7eda613c5e87342889e55b9e5ba96.tar nixpkgs-1d26caa746f7eda613c5e87342889e55b9e5ba96.tar.gz nixpkgs-1d26caa746f7eda613c5e87342889e55b9e5ba96.tar.bz2 nixpkgs-1d26caa746f7eda613c5e87342889e55b9e5ba96.tar.lz nixpkgs-1d26caa746f7eda613c5e87342889e55b9e5ba96.tar.xz nixpkgs-1d26caa746f7eda613c5e87342889e55b9e5ba96.tar.zst nixpkgs-1d26caa746f7eda613c5e87342889e55b9e5ba96.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/interpreters/pixie/default.nix')
| -rw-r--r-- | pkgs/development/interpreters/pixie/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix index 9b57e153aa0..02f561c004e 100644 --- a/pkgs/development/interpreters/pixie/default.nix +++ b/pkgs/development/interpreters/pixie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fetchurl, python2, makeWrapper, pkgconfig, gcc, +{ stdenv, fetchgit, fetchurl, python2, makeWrapper, pkg-config, gcc, pypy, libffi, libedit, libuv, boost, zlib, variant ? "jit", buildWithPypy ? false }: @@ -32,7 +32,7 @@ let build = {flags, target}: stdenv.mkDerivation rec { pname = "pixie"; version = "0-r${commit-count}-${variant}"; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = libs; PYTHON = if buildWithPypy then "${pypy}/pypy-c/pypy-c" |