diff options
| author | makefu <github@syntax-fehler.de> | 2017-07-23 10:23:40 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2017-07-23 10:23:40 +0200 |
| commit | 3ee48434e3282ccd2b6ad83dd6c0d6552a54b71d (patch) | |
| tree | 6c9c0cc04db334cbff93e97fd2f4b0702fdfd1b4 /tv/5pkgs | |
| parent | 20d5077ba6f67ea0b73345248f048eafda6548e4 (diff) | |
| parent | 54a594dc474255b24bbff80bb6be28e6a1a523d4 (diff) | |
Merge branch 'master' of prism:stockholm
Diffstat (limited to 'tv/5pkgs')
| -rw-r--r-- | tv/5pkgs/default.nix | 4 | ||||
| -rw-r--r-- | tv/5pkgs/ejabberd/default.nix | 28 |
2 files changed, 0 insertions, 32 deletions
diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix index 284e42a79..02410e8e6 100644 --- a/tv/5pkgs/default.nix +++ b/tv/5pkgs/default.nix @@ -28,10 +28,6 @@ in { "$@" ''; - ejabberd = callPackage ./ejabberd { - erlang = self.erlangR16; - }; - ff = self.writeDashBin "ff" '' exec ${self.firefoxWrapper}/bin/firefox "$@" ''; diff --git a/tv/5pkgs/ejabberd/default.nix b/tv/5pkgs/ejabberd/default.nix deleted file mode 100644 index 3a77c5cd1..000000000 --- a/tv/5pkgs/ejabberd/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{stdenv, fetchurl, expat, erlang, zlib, openssl, pam, lib}: - -stdenv.mkDerivation rec { - version = "2.1.13"; - name = "ejabberd-${version}"; - src = fetchurl { - url = "http://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz"; - sha256 = "0vf8mfrx7vr3c5h3nfp3qcgwf2kmzq20rjv1h9sk3nimwir1q3d8"; - }; - buildInputs = [ expat erlang zlib openssl pam ]; - patchPhase = '' - sed -i \ - -e "s|erl \\\|${erlang}/bin/erl \\\|" \ - -e 's|EXEC_CMD=\"sh -c\"|EXEC_CMD=\"${stdenv.shell} -c\"|' \ - src/ejabberdctl.template - ''; - preConfigure = '' - cd src - ''; - configureFlags = ["--enable-pam"]; - - meta = { - description = "Open-source XMPP application server written in Erlang"; - license = stdenv.lib.licenses.gpl2; - homepage = http://www.ejabberd.im; - maintainers = [ lib.maintainers.sander ]; - }; -} |