diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-02-10 18:00:38 +0100 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-02-10 18:00:38 +0100 |
| commit | b95f9bd48cbb8a1b33c815bfcfebd2fce5b0175b (patch) | |
| tree | 377ae5fb0eab6b3f296f4d6c5027cbf872cd6449 /pkgs/top-level | |
| parent | e0151287665f9522a417ad317c07d79731a38a4d (diff) | |
| download | nixlib-b95f9bd48cbb8a1b33c815bfcfebd2fce5b0175b.tar nixlib-b95f9bd48cbb8a1b33c815bfcfebd2fce5b0175b.tar.gz nixlib-b95f9bd48cbb8a1b33c815bfcfebd2fce5b0175b.tar.bz2 nixlib-b95f9bd48cbb8a1b33c815bfcfebd2fce5b0175b.tar.lz nixlib-b95f9bd48cbb8a1b33c815bfcfebd2fce5b0175b.tar.xz nixlib-b95f9bd48cbb8a1b33c815bfcfebd2fce5b0175b.tar.zst nixlib-b95f9bd48cbb8a1b33c815bfcfebd2fce5b0175b.zip | |
javaPackages.jogl_2_4_0: rename to jogl
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/java-packages.nix | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8bb1c036dcd..27d249b426b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9615,6 +9615,10 @@ with pkgs; go-jira = callPackage ../applications/misc/go-jira { }; + jogl = callPackage ../by-name/jo/jogl/package.nix { + stdenv = if stdenv.isDarwin && stdenv.isx86_64 then overrideSDK stdenv "11.0" else stdenv; + }; + john = callPackage ../tools/security/john { }; joomscan = callPackage ../tools/security/joomscan { }; diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index 4c2fd0d4251e..3043f8e220eb 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -236,10 +236,8 @@ in { else ../development/compilers/semeru-bin/jdk-darwin.nix ) {}); }; - - inherit (pkgs.darwin.apple_sdk_11_0.callPackage ../development/java-modules/jogl { }) - jogl_2_4_0; } // lib.optionalAttrs config.allowAliases { + jogl_2_4_0 = throw "'jogl_2_4_0' is renamed to/replaced by 'jogl'"; mavenfod = throw "'mavenfod' is renamed to/replaced by 'maven.buildMavenPackage'"; } |