public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spidermonkey: remove spidermonkey_38 -> spidermonkey alias

Browse Source 
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
This commit is contained in:
Maciej Krüger
2020-10-01 10:00:22 +02:00
parent 7779eb31c5
commit 946369adbd
5 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/browsers/elinks/default.nix
+5 -5
View File
@@ -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