diff --git a/build.nix b/build.nix index 5d073db..35230e3 100644 --- a/build.nix +++ b/build.nix @@ -1,7 +1,7 @@ { pkgs, src }: with pkgs; -with stdenv.lib; +with pkgs.lib; let self = stdenv.mkDerivation rec { inherit src; @@ -39,14 +39,12 @@ let EOF ''; - rpath = stdenv.lib.strings.makeLibraryPath [ + rpath = strings.makeLibraryPath [ stdenv.cc.libc stdenv.cc.cc.lib glib linux-pam libxml2 - libav_0_8 - ffmpeg_3 libxslt libGL xorg.libXxf86vm diff --git a/flake.lock b/flake.lock index c83cd08..655ddec 100644 --- a/flake.lock +++ b/flake.lock @@ -18,16 +18,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1611219034, - "narHash": "sha256-bgp8G3LcpvKs22/z5Cj4XQkmZq05Aa0vaP1bKl7X0zM=", + "lastModified": 1613161067, + "narHash": "sha256-pje2ooiswUj1uf8hDFVQsFYxoLlzKOGr4geJ75SleBc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f217c0ea7c148ddc0103347051555c7c252dcafb", + "rev": "5852a21819542e6809f68ba5a798600e69874e76", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -42,13 +42,13 @@ "src": { "flake": false, "locked": { - "narHash": "sha256-jiXy1Rlr/PG62+E5gbW7gggTPXXKwlhkcAzQvbiwiuU=", + "narHash": "sha256-HkhuD9nsr7VDDQOWYowZp1ZqQteU7tZHc2tOKbnhlDg=", "type": "tarball", - "url": "https://cdn.azul.com/zing-zvm/feature-preview/zing99.99.99.99-fp.dev-3370-jdk15.0.1.tar.gz" + "url": "https://cdn.azul.com/zing-zvm/feature-preview/zing99.99.99.99-fp.dev-3382-jdk15.0.1.tar.gz" }, "original": { "type": "tarball", - "url": "https://cdn.azul.com/zing-zvm/feature-preview/zing99.99.99.99-fp.dev-3370-jdk15.0.1.tar.gz" + "url": "https://cdn.azul.com/zing-zvm/feature-preview/zing99.99.99.99-fp.dev-3382-jdk15.0.1.tar.gz" } } }, diff --git a/flake.nix b/flake.nix index 7c700ad..5e0a853 100644 --- a/flake.nix +++ b/flake.nix @@ -2,13 +2,13 @@ description = "Azul Zing 15 Feature Preview flake"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; flake-compat = { url = "github:edolstra/flake-compat"; flake = false; }; src = { - url = "https://cdn.azul.com/zing-zvm/feature-preview/zing99.99.99.99-fp.dev-3370-jdk15.0.1.tar.gz"; + url = "https://cdn.azul.com/zing-zvm/feature-preview/zing99.99.99.99-fp.dev-3382-jdk15.0.1.tar.gz"; flake = false; }; };