From 946369adbd53c3abbff89ba068d64d6401d5bda5 Mon Sep 17 00:00:00 2001 From: Maciej Krüger Date: Wed, 30 Sep 2020 16:00:56 +0200 Subject: spidermonkey: remove spidermonkey_38 -> spidermonkey alias This removes the spidermonkey alias and renames it in the packages still using it Not sure if we need it in aliases.nix since just about nothing depends on it anymore Additionally considering removal should be a good choice, it's at least insecure so it should get tagged as such --- pkgs/applications/networking/browsers/elinks/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs/applications/networking/browsers') diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index ccdd591cdb17b..7d67ecdb37678 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -4,7 +4,7 @@ enableGuile ? false, guile ? null , enablePython ? false, python ? null , enablePerl ? (stdenv.hostPlatform == stdenv.buildPlatform), perl ? null -, enableSpidermonkey ? (stdenv.hostPlatform == stdenv.buildPlatform), spidermonkey ? null +, enableSpidermonkey ? (stdenv.hostPlatform == stdenv.buildPlatform), spidermonkey_38 ? null }: assert enableGuile -> guile != null; @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional enableGuile guile ++ stdenv.lib.optional enablePython python ++ stdenv.lib.optional enablePerl perl - ++ stdenv.lib.optional enableSpidermonkey spidermonkey + ++ stdenv.lib.optional enableSpidermonkey spidermonkey_38 ; - + nativeBuildInputs = [ autoconf automake gettext pkgconfig ]; configureFlags = [ @@ -50,9 +50,9 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional enableGuile "--with-guile" ++ stdenv.lib.optional enablePython "--with-python" ++ stdenv.lib.optional enablePerl "--with-perl" - ++ stdenv.lib.optional enableSpidermonkey "--with-spidermonkey=${spidermonkey}" + ++ stdenv.lib.optional enableSpidermonkey "--with-spidermonkey=${spidermonkey_38}" ; - + preConfigure = '' patchShebangs ./autogen.sh ./autogen.sh -- cgit 1.4.1