From 7e49ce6fbd460147add286b409ae6e74de99cfa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= Date: Thu, 24 Nov 2022 16:45:28 +0100 Subject: [PATCH] Nix: add patched libglvnd overlay --- flake.nix | 17 ++++++++++++----- overlays/nixpkgs.nix | 11 +++++++++++ 2 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 overlays/nixpkgs.nix diff --git a/flake.nix b/flake.nix index 065de7d..df8ec87 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "Gluing native OpenGL drivers"; + description = "Gluing host OpenGL drivers to a Nix-built binary"; inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; outputs = { self @@ -11,12 +11,18 @@ "aarch64-linux" ]; forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f system); + pkgs = system: import nixpkgs { + inherit system; + overlays = [ self.overlays.default ]; + }; in { - defaultPackage = forAllSystems (system: - import ./default.nix { - pkgs = import nixpkgs { inherit system; }; - }); + defaultPackage = forAllSystems (system: import ./default.nix { pkgs = pkgs system; }); + + overlays.default = import ./overlays/nixpkgs.nix; + + legacyPackages = forAllSystems (system: (pkgs system)); + devShell = forAllSystems (system: nixpkgs.legacyPackages.${system}.callPackage ./shell.nix { } ); @@ -24,5 +30,6 @@ formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.nixpkgs-fmt ); + }; } diff --git a/overlays/nixpkgs.nix b/overlays/nixpkgs.nix new file mode 100644 index 0000000..a575913 --- /dev/null +++ b/overlays/nixpkgs.nix @@ -0,0 +1,11 @@ +self: super: +{ + libglvnd = super.libglvnd.overrideAttrs (old: { + src = super.fetchFromGitHub { + owner = "NinjaTrappeur"; + repo = "libglvnd"; + rev = "f4dff011f78ecd5a69871d4a8ddf3c742de5f621"; + sha256 = "sha256-57awDiR9DaFTGe8J4ed89Xm3Fc4/OM6qflsuHqx9mxE="; + }; + }); +}