pyrox.dev / nixpkgs
lol
fork atom

jre: Set valid value for meta.outputsToInstall

Fixes #17866.

Eelco Dolstra 5db200e8 4a755682

+6 -2
unified split
+6 -2
pkgs/top-level/all-packages.nix
··· 4791 4791 openjdk = if stdenv.isDarwin then self.openjdk7 else self.openjdk8; 4792 4792 4793 4793 jdk7 = self.openjdk7 // { outputs = [ "out" ]; }; 4794 - jre7 = lib.setName "openjre-${lib.getVersion pkgs.openjdk7.jre}" (self.openjdk7.jre // { outputs = [ "jre" ]; }); 4794 + jre7 = lib.setName "openjre-${lib.getVersion pkgs.openjdk7.jre}" 4795 + (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } 4796 + (self.openjdk7.jre // { outputs = [ "jre" ]; })); 4795 4797 4796 4798 jdk8 = self.openjdk8 // { outputs = [ "out" ]; }; 4797 - jre8 = lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" (self.openjdk8.jre // { outputs = [ "jre" ]; }); 4799 + jre8 = lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" 4800 + (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } 4801 + (self.openjdk8.jre // { outputs = [ "jre" ]; })); 4798 4802 4799 4803 jdk = if stdenv.isDarwin then self.jdk7 else self.jdk8; 4800 4804 jre = if stdenv.isDarwin then self.jre7 else self.jre8;