diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2016-10-17 14:08:08 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-10-18 23:14:34 +0200 |
| commit | f17f64d203dc4e91135d9559fc21d11e2039da9c (patch) | |
| tree | a6f75ca0369e3b4e0ff8929df69a7fadc336aa20 | |
| parent | 77fa967363cb98eb12e75446889974d0398c283b (diff) | |
| download | nixlib-f17f64d203dc4e91135d9559fc21d11e2039da9c.tar nixlib-f17f64d203dc4e91135d9559fc21d11e2039da9c.tar.gz nixlib-f17f64d203dc4e91135d9559fc21d11e2039da9c.tar.bz2 nixlib-f17f64d203dc4e91135d9559fc21d11e2039da9c.tar.lz nixlib-f17f64d203dc4e91135d9559fc21d11e2039da9c.tar.xz nixlib-f17f64d203dc4e91135d9559fc21d11e2039da9c.tar.zst nixlib-f17f64d203dc4e91135d9559fc21d11e2039da9c.zip | |
http-parser: use python2
| -rw-r--r-- | pkgs/development/libraries/http-parser/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix index df3f68b12493..980dd1f18a28 100644 --- a/pkgs/development/libraries/http-parser/default.nix +++ b/pkgs/development/libraries/http-parser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gyp, utillinux, python, fixDarwinDylibNames }: +{ stdenv, fetchurl, python2Packages, utillinux, fixDarwinDylibNames }: let version = "2.7.0"; @@ -17,9 +17,9 @@ in stdenv.mkDerivation { buildFlags = [ "BUILDTYPE=Release" ]; buildInputs = - [ gyp ] + [ python2Packages.gyp ] ++ stdenv.lib.optional stdenv.isLinux utillinux - ++ stdenv.lib.optionals stdenv.isDarwin [ python fixDarwinDylibNames ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ python2Packages.python fixDarwinDylibNames ]; doCheck = !stdenv.isDarwin; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da626229c9a4..93eb25f1bde4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7258,7 +7258,7 @@ in htmlcxx = callPackage ../development/libraries/htmlcxx { }; - http-parser = callPackage ../development/libraries/http-parser { inherit (pythonPackages) gyp; }; + http-parser = callPackage ../development/libraries/http-parser { }; hunspell = callPackage ../development/libraries/hunspell { }; |