diff --git a/flake.lock b/flake.lock index 985a58d..fa761e6 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1667653703, - "narHash": "sha256-Xow4vx52/g5zkhlgZnMEm/TEXsj+13jTPCc2jIhW1xU=", + "lastModified": 1739484910, + "narHash": "sha256-wjWLzdM7PIq4ZAe7k3vyjtgVJn6b0UeodtRFlM/6W5U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f09ad462c5a121d0239fde645aacb2221553a217", + "rev": "0b73e36b1962620a8ac551a37229dd8662dac5c8", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-22.05", + "ref": "nixos-24.11", "type": "indirect" } }, diff --git a/flake.nix b/flake.nix index 7a65f14..690f569 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "java web applet resurrection"; inputs = { - nixpkgs.url = "nixpkgs/nixos-22.05"; + nixpkgs.url = "nixpkgs/nixos-24.11"; old-nixpkgs = { flake = false; @@ -16,10 +16,10 @@ # 1.6.1 - 2016-02-08 url = "https://github.com/NixOS/nixpkgs/archive/dd7e6bd97fc26b72fb6ac9e9d6f9750980fd3f56.tar.gz"; - + # 1.6.2 - 2018-03-12 # url = "https://github.com/NixOS/nixpkgs/archive/2c9d2d65266c2c3aca1e4c80215de8bee5295b04.tar.gz"; - + # 1.7.1 - 2019-06-24 # url = "https://github.com/NixOS/nixpkgs/archive/4599f2bb9a5a6b1482e72521ead95cb24e0aa819.tar.gz"; }; @@ -27,8 +27,15 @@ outputs = { self, nixpkgs, old-nixpkgs }: let system = "x86_64-linux"; - pkgs = import nixpkgs { inherit system; }; - old-pkgs = import old-nixpkgs { inherit system; }; + pkgs = nixpkgs.legacyPackages.${system}; + + patched-nixpkgs = pkgs.applyPatches { + name = "patches-nixpkgs-r710"; + src = old-nixpkgs; + patches = [ ./mesa.patch ]; + }; + + old-pkgs = import patched-nixpkgs { inherit system; }; in { apps.${system} = { default = self.apps.${system}.javaws-adjusted-viewer; @@ -48,6 +55,7 @@ }; packages.${system} = { + inherit patched-nixpkgs; icedtea-web = old-pkgs.icedtea8_web; adjusted-viewer = pkgs.callPackage ./adjust-viewer.nix { ip = "localhost"; diff --git a/mesa.patch b/mesa.patch new file mode 100644 index 0000000..5e4c17d --- /dev/null +++ b/mesa.patch @@ -0,0 +1,29 @@ +diff --git i/pkgs/development/libraries/mesa/default.nix w/pkgs/development/libraries/mesa/default.nix +index c6af00d08b87..40cb0ec35258 100644 +--- i/pkgs/development/libraries/mesa/default.nix ++++ w/pkgs/development/libraries/mesa/default.nix +@@ -1,4 +1,4 @@ +-{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, flex, bison, autoreconfHook, substituteAll ++{ stdenv, fetchzip, fetchpatch, pkgconfig, intltool, flex, bison, autoreconfHook, substituteAll + , python, libxml2Python, file, expat, makedepend, pythonPackages + , libdrm, xorg, wayland, udev, llvmPackages, libffi, libomxil-bellagio + , libvdpau, libelf, libva +@@ -31,14 +31,10 @@ with { inherit (stdenv.lib) optional optionals optionalString; }; + stdenv.mkDerivation { + name = "mesa-noglu-${version}"; + +- src = fetchurl { +- urls = [ +- "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" +- (with stdenv.lib; ''ftp://ftp.freedesktop.org/pub/mesa/older-versions/'' +- + head (splitString "." version) + ''.x/${version}/mesa-${version}.tar.xz'') +- "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz" +- ]; +- sha256 = "5696e4730518b6805d2ed5def393c4293f425a2c2c01bd5ed4bdd7ad62f7ad75"; ++ src = fetchzip { ++ name = "mesa"; ++ url = "https://gitlab.freedesktop.org/mesa/mesa/-/archive/mesa-11.0.8/mesa-mesa-11.0.8.tar.gz"; ++ sha256 = "sha256-ydcYkDPk1n77veeM/l4Z+BnKv8Qr9AfyP8oiT47zAaI="; + }; + + prePatch = "patchShebangs .";