diff options
| author | Mihai Fufezan <[email protected]> | 2022-10-15 01:39:49 +0300 |
|---|---|---|
| committer | Mihai Fufezan <[email protected]> | 2022-10-15 01:40:25 +0300 |
| commit | f30e572e003e8a92feba531651eafc7a9ae5bf17 (patch) | |
| tree | 55a68185b1a04918a4093f6e19b20f8c41ca135e | |
| parent | 34cd8b125ad9f03ababd7789ebe12eac69e23227 (diff) | |
| download | Hyprland-f30e572e003e8a92feba531651eafc7a9ae5bf17.tar.gz Hyprland-f30e572e003e8a92feba531651eafc7a9ae5bf17.zip | |
Nix & meson: 0.15.0beta -> 0.15.3beta
Nix: remove merged libdrm update
| -rw-r--r-- | flake.nix | 34 | ||||
| -rw-r--r-- | meson.build | 2 |
2 files changed, 6 insertions, 30 deletions
@@ -20,35 +20,11 @@ "aarch64-linux" "x86_64-linux" ]; - pkgsFor = genSystems (system: - import nixpkgs { - inherit system; - overlays = [ - (_: prev: { - libdrm = prev.libdrm.overrideAttrs (old: rec { - version = "2.4.113"; - src = prev.fetchurl { - url = "https://dri.freedesktop.org/${old.pname}/${old.pname}-${version}.tar.xz"; - sha256 = "sha256-f9frKWf2O+tGBvItUOJ32ZNIDQXvdd2Iqb2OZ3Mj5eE="; - }; - mesonFlags = - [ - "-Dinstall-test-programs=true" - "-Domap=enabled" - "-Dcairo-tests=disabled" - ] - ++ lib.optionals prev.stdenv.hostPlatform.isAarch [ - "-Dtegra=enabled" - "-Detnaviv=enabled" - ]; - }); - }) - ]; - }); + pkgsFor = nixpkgs.legacyPackages; mkDate = longDate: (lib.concatStringsSep "-" [ - (__substring 0 4 longDate) - (__substring 4 2 longDate) - (__substring 6 2 longDate) + (builtins.substring 0 4 longDate) + (builtins.substring 4 2 longDate) + (builtins.substring 6 2 longDate) ]); in { overlays.default = _: prev: rec { @@ -58,7 +34,7 @@ }; hyprland = prev.callPackage ./nix/default.nix { stdenv = prev.gcc12Stdenv; - version = "0.15.0beta" + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty"); + version = "0.15.3beta" + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty"); wlroots = wlroots-hyprland; }; hyprland-debug = hyprland.override {debug = true;}; diff --git a/meson.build b/meson.build index 5de1f741..c7e94e88 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('Hyprland', 'cpp', 'c', - version : '0.15.0beta', + version : '0.15.3beta', default_options : [ 'warning_level=2', 'default_library=static', |