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

icedtea: Make major version nonspecific attrs

Browse Source
This commit is contained in:
William A. Kennington III 2015-01-01 08:17:16 -08:00
parent 0ed2a253f1
commit 8627110091
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/networking/unifi.nix
View File

@ -3,7 +3,7 @@ with lib;
let let
cfg = config.services.unifi; cfg = config.services.unifi;
stateDir = "/var/lib/unifi"; stateDir = "/var/lib/unifi";
cmd = "@${pkgs.icedtea7_jre}/bin/java java -jar ${stateDir}/lib/ace.jar"; cmd = "@${pkgs.jre}/bin/java java -jar ${stateDir}/lib/ace.jar";
mountPoints = [ mountPoints = [
{ {
what = "${pkgs.unifi}/dl"; what = "${pkgs.unifi}/dl";

10
pkgs/top-level/all-packages.nix
View File

@ -3428,6 +3428,10 @@ let
xulrunner = firefox; xulrunner = firefox;
}; };
icedtea_jdk = icedtea7_jdk;
icedtea_jre = icedtea7_jre;
icedtea_web = icedtea7_web;
ikarus = callPackage ../development/compilers/ikarus { }; ikarus = callPackage ../development/compilers/ikarus { };
hugs = callPackage ../development/compilers/hugs { }; hugs = callPackage ../development/compilers/hugs { };
@ -7579,7 +7583,7 @@ let
cassandra = callPackage ../servers/nosql/cassandra { }; cassandra = callPackage ../servers/nosql/cassandra { };
apache-jena = callPackage ../servers/nosql/apache-jena/binary.nix { apache-jena = callPackage ../servers/nosql/apache-jena/binary.nix {
java = icedtea7_jdk; java = icedtea_jdk;
}; };
apcupsd = callPackage ../servers/apcupsd { }; apcupsd = callPackage ../servers/apcupsd { };
@ -11178,7 +11182,7 @@ let
vorbisTools = callPackage ../applications/audio/vorbis-tools { }; vorbisTools = callPackage ../applications/audio/vorbis-tools { };
vue = callPackage ../applications/misc/vue { vue = callPackage ../applications/misc/vue {
jre = icedtea7_jre; jre = icedtea_jre;
}; };
vwm = callPackage ../applications/window-managers/vwm { }; vwm = callPackage ../applications/window-managers/vwm { };
@ -11257,7 +11261,7 @@ let
++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser) ++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser)
++ lib.optional (cfg.enableGeckoMediaPlayer or false) gecko_mediaplayer ++ lib.optional (cfg.enableGeckoMediaPlayer or false) gecko_mediaplayer
++ lib.optional (supportsJDK && jre && jrePlugin ? mozillaPlugin) jrePlugin ++ lib.optional (supportsJDK && jre && jrePlugin ? mozillaPlugin) jrePlugin
++ lib.optional icedtea icedtea7_web ++ lib.optional icedtea icedtea_web
++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin
++ lib.optional (cfg.enableFriBIDPlugin or false) fribid ++ lib.optional (cfg.enableFriBIDPlugin or false) fribid
++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome_shell ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome_shell