diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-03-22 16:41:59 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-03-22 16:41:59 +0100 |
| commit | 46a88117a05c3469af5d99433af140c3de8ca088 (patch) | |
| tree | d7f0557756d8f07a3081b3498c05ddc5a8ad429d /nixpkgs/pkgs/development/misc | |
| parent | e97457545cea0b2ca421da257c83d8f1ef451d85 (diff) | |
| parent | a343533bccc62400e8a9560423486a3b6c11a23b (diff) | |
| download | nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.gz nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.bz2 nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.lz nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.xz nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.zst nixlib-46a88117a05c3469af5d99433af140c3de8ca088.zip | |
Merge commit 'a343533bccc62400e8a9560423486a3b6c11a23b'
Diffstat (limited to 'nixpkgs/pkgs/development/misc')
| -rw-r--r-- | nixpkgs/pkgs/development/misc/resholve/oildev.nix | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/nixpkgs/pkgs/development/misc/resholve/oildev.nix b/nixpkgs/pkgs/development/misc/resholve/oildev.nix index 2098ec80f5ae..767cedee3913 100644 --- a/nixpkgs/pkgs/development/misc/resholve/oildev.nix +++ b/nixpkgs/pkgs/development/misc/resholve/oildev.nix @@ -4,34 +4,17 @@ , callPackage , fetchFromGitHub , makeWrapper -, # re2c deps - autoreconfHook , # py-yajl deps git , # oil deps - file -, pkgsBuildBuild + pkgsBuildBuild +, re2c +, file , six , typing }: rec { - re2c = stdenv.mkDerivation rec { - pname = "re2c"; - version = "1.0.3"; - sourceRoot = "${src.name}/re2c"; - src = fetchFromGitHub { - owner = "skvadrik"; - repo = "re2c"; - rev = version; - sha256 = "0grx7nl9fwcn880v5ssjljhcb9c5p2a6xpwil7zxpmv0rwnr3yqi"; - }; - nativeBuildInputs = [ autoreconfHook ]; - preCheck = '' - patchShebangs run_tests.sh - ''; - }; - py-yajl = python27.pkgs.buildPythonPackage rec { pname = "oil-pyyajl-unstable"; version = "2022-09-01"; @@ -103,7 +86,9 @@ rec { "--without-readline" ]; - nativeBuildInputs = [ re2c file makeWrapper ]; + depsBuildBuild = [ re2c ]; + + nativeBuildInputs = [ file makeWrapper ]; propagatedBuildInputs = [ six typing py-yajl ]; |