diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-01-01 08:17:16 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-01-02 00:24:49 -0800 |
| commit | 86271100914411f21f32d98e79b5782e756745e8 (patch) | |
| tree | 63871b0009adee3bbf3698e426c153992bb88d29 | |
| parent | 0ed2a253f195453e60d910227b13c7f69e38d3ed (diff) | |
| download | nixpkgs-86271100914411f21f32d98e79b5782e756745e8.tar nixpkgs-86271100914411f21f32d98e79b5782e756745e8.tar.gz nixpkgs-86271100914411f21f32d98e79b5782e756745e8.tar.bz2 nixpkgs-86271100914411f21f32d98e79b5782e756745e8.tar.lz nixpkgs-86271100914411f21f32d98e79b5782e756745e8.tar.xz nixpkgs-86271100914411f21f32d98e79b5782e756745e8.tar.zst nixpkgs-86271100914411f21f32d98e79b5782e756745e8.zip | |
icedtea: Make major version nonspecific attrs
| -rw-r--r-- | nixos/modules/services/networking/unifi.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index 8905ff1598b..d6c8e0dc7a5 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -3,7 +3,7 @@ with lib; let cfg = config.services.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 = [ { what = "${pkgs.unifi}/dl"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a6718f036b..6e73cdd56d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3428,6 +3428,10 @@ let xulrunner = firefox; }; + icedtea_jdk = icedtea7_jdk; + icedtea_jre = icedtea7_jre; + icedtea_web = icedtea7_web; + ikarus = callPackage ../development/compilers/ikarus { }; hugs = callPackage ../development/compilers/hugs { }; @@ -7579,7 +7583,7 @@ let cassandra = callPackage ../servers/nosql/cassandra { }; apache-jena = callPackage ../servers/nosql/apache-jena/binary.nix { - java = icedtea7_jdk; + java = icedtea_jdk; }; apcupsd = callPackage ../servers/apcupsd { }; @@ -11178,7 +11182,7 @@ let vorbisTools = callPackage ../applications/audio/vorbis-tools { }; vue = callPackage ../applications/misc/vue { - jre = icedtea7_jre; + jre = icedtea_jre; }; vwm = callPackage ../applications/window-managers/vwm { }; @@ -11257,7 +11261,7 @@ let ++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser) ++ lib.optional (cfg.enableGeckoMediaPlayer or false) gecko_mediaplayer ++ 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.enableFriBIDPlugin or false) fribid ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome_shell |