diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-08-31 22:16:05 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2018-08-31 22:27:13 +0200 |
| commit | 85fdbf61230ba2ab2bf8429c823d2d7cf0d5ed46 (patch) | |
| tree | 2e591603898f0533b79448efb7636cf27e4cc215 | |
| parent | c6a7bf0bc24e9e89d41d83de1a0eb51cf609449f (diff) | |
| download | nixlib-85fdbf61230ba2ab2bf8429c823d2d7cf0d5ed46.tar nixlib-85fdbf61230ba2ab2bf8429c823d2d7cf0d5ed46.tar.gz nixlib-85fdbf61230ba2ab2bf8429c823d2d7cf0d5ed46.tar.bz2 nixlib-85fdbf61230ba2ab2bf8429c823d2d7cf0d5ed46.tar.lz nixlib-85fdbf61230ba2ab2bf8429c823d2d7cf0d5ed46.tar.xz nixlib-85fdbf61230ba2ab2bf8429c823d2d7cf0d5ed46.tar.zst nixlib-85fdbf61230ba2ab2bf8429c823d2d7cf0d5ed46.zip | |
cuter: use erlangR19 and cleanp expression
It fails to build using R20 and there's no new release available.
| -rw-r--r-- | pkgs/development/tools/erlang/cuter/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/development/tools/erlang/cuter/default.nix b/pkgs/development/tools/erlang/cuter/default.nix index a89861faebbc..af58762f80eb 100644 --- a/pkgs/development/tools/erlang/cuter/default.nix +++ b/pkgs/development/tools/erlang/cuter/default.nix @@ -1,5 +1,5 @@ { stdenv, autoreconfHook, which, writeText, makeWrapper, fetchFromGitHub, erlang -, beamPackages, z3, python27 }: +, beamPackages, z3, python }: stdenv.mkDerivation rec { name = "cuter-${version}"; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { addToSearchPath ERL_LIBS "$1/lib/erlang/lib/" ''; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = with beamPackages; [ python27.pkgs.setuptools erlang z3.python python27 makeWrapper which ]; + nativeBuildInputs = [ autoreconfHook makeWrapper which ]; + buildInputs = [ python python.pkgs.setuptools z3.python erlang ]; buildFlags = "PWD=$(out)/lib/erlang/lib/cuter-${version} cuter_target"; configurePhase = '' @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { cp -r * "$out/lib/erlang/lib/cuter-${version}" cp cuter "$out/bin/cuter" wrapProgram $out/bin/cuter \ - --prefix PATH : "${python27}/bin" \ - --suffix PYTHONPATH : "${z3}/lib/python2.7/site-packages" \ + --prefix PATH : "${python}/bin" \ + --suffix PYTHONPATH : "${z3}/${python.sitePackages}" \ --suffix ERL_LIBS : "$out/lib/erlang/lib" ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b28c3ad52f1..7d252bf44b29 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7309,9 +7309,10 @@ with pkgs; inherit (beam.packages.erlang) rebar rebar3-open rebar3 hexRegistrySnapshot fetchHex beamPackages - hex2nix cuter; + hex2nix; inherit (beam.packages.erlangR18) relxExe; + inherit (beam.packages.erlangR19) cuter; groovy = callPackage ../development/interpreters/groovy { }; |