From b509dadbf157316b88641cd5d64a23ab524f486f Mon Sep 17 00:00:00 2001 From: Eric Merritt Date: Sun, 10 Jan 2016 15:16:53 -0800 Subject: [PATCH] erlang support: remove broken buildErlang function The buildErlang function is broken and and leads Engineers down a wrong path. For vanilla erlang that doesn't user rebar3, its better to simply use `stdenv.mkDerivation` along with a set setupHook then the existing functionality. --- .../erlang-modules/build-erlang.nix | 68 ------------------- pkgs/development/erlang-modules/default.nix | 1 - 2 files changed, 69 deletions(-) delete mode 100644 pkgs/development/erlang-modules/build-erlang.nix diff --git a/pkgs/development/erlang-modules/build-erlang.nix b/pkgs/development/erlang-modules/build-erlang.nix deleted file mode 100644 index e662166741a..00000000000 --- a/pkgs/development/erlang-modules/build-erlang.nix +++ /dev/null @@ -1,68 +0,0 @@ -# This file is not used not tested at this time, build-hex.nix is the currently -# main vehicle of bringing Erlang packages in. - -{ stdenv, erlang, rebar, openssl, libyaml }: - -{ name, version -, buildInputs ? [], erlangDeps ? [] -, postPatch ? "" -, meta ? {} -, ... }@attrs: - -with stdenv.lib; - -stdenv.mkDerivation (attrs // { - name = "${name}-${version}"; - - buildInputs = buildInputs ++ [ erlang rebar openssl libyaml ]; - - postPatch = '' - rm -f rebar - if [ -e "src/${name}.app.src" ]; then - sed -i -e 's/{ *vsn *,[^}]*}/{vsn, "${version}"}/' "src/${name}.app.src" - fi - ${postPatch} - ''; - - configurePhase = let - getDeps = drv: [drv] ++ (map getDeps drv.erlangDeps); - recursiveDeps = uniqList { - inputList = flatten (map getDeps erlangDeps); - }; - in '' - runHook preConfigure - ${concatMapStrings (dep: '' - header "linking erlang dependency ${dep}" - mkdir deps - ln -s "${dep}" "deps/${dep.packageName}" - stopNest - '') recursiveDeps} - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - rebar compile - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - for reldir in src ebin priv include; do - [ -e "$reldir" ] || continue - mkdir "$out" - cp -rt "$out" "$reldir" - success=1 - done - runHook postInstall - ''; - - meta = { - inherit (erlang.meta) platforms; - } // meta; - - passthru = { - packageName = name; - inherit erlangDeps; - }; -}) diff --git a/pkgs/development/erlang-modules/default.nix b/pkgs/development/erlang-modules/default.nix index 53d54a77a60..4180ddc8121 100644 --- a/pkgs/development/erlang-modules/default.nix +++ b/pkgs/development/erlang-modules/default.nix @@ -4,7 +4,6 @@ let self = rec { hex = import ./hex-packages.nix { callPackage = self.callPackage; }; callPackage = pkgs.lib.callPackageWith (pkgs // self // hex); - buildErlang = callPackage ./build-erlang.nix {}; buildHex = callPackage ./build-hex.nix {}; }; in self // self.hex