Skip to content

Commit

Permalink
Merge pull request #2814 from khaneliman/flake-update
Browse files Browse the repository at this point in the history
flake update and direnv fix
Alexays authored Jan 12, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents 748fc80 + b239c77 commit e609722
Showing 4 changed files with 48 additions and 25 deletions.
File renamed without changes.
6 changes: 3 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 26 additions & 20 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
description = "Highly customizable Wayland bar for Sway and Wlroots based compositors.";
description = "Highly customizable Wayland bar for Sway and Wlroots based compositors";

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
@@ -15,7 +15,8 @@
genSystems = func: lib.genAttrs [
"x86_64-linux"
"aarch64-linux"
] (system: func (import nixpkgs { inherit system; }));
]
(system: func (import nixpkgs { inherit system; }));

mkDate = longDate: (lib.concatStringsSep "-" [
(builtins.substring 0 4 longDate)
@@ -24,6 +25,27 @@
]);
in
{
devShells = genSystems
(pkgs:
{
default =
pkgs.mkShell
{
name = "waybar-shell";

# inherit attributes from upstream nixpkgs derivation
inherit (pkgs.waybar) buildInputs depsBuildBuild depsBuildBuildPropagated depsBuildTarget
depsBuildTargetPropagated depsHostHost depsHostHostPropagated depsTargetTarget
depsTargetTargetPropagated propagatedBuildInputs propagatedNativeBuildInputs strictDeps;

# overrides for local development
nativeBuildInputs = pkgs.waybar.nativeBuildInputs ++ (with pkgs; [
clang-tools
gdb
]);
};
});

overlays.default = final: prev: {
waybar = final.callPackage ./nix/default.nix {
# take the first "version: '...'" from meson.build
@@ -35,27 +57,11 @@
+ "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty");
};
};

packages = genSystems (pkgs:
let packages = self.overlays.default pkgs pkgs;
in packages // {
default = packages.waybar;
});
} //
genSystems (pkgs: {
devShells.default =
pkgs.mkShell {
name = "waybar-shell";

# most of these aren't actually used in the waybar derivation, this is just in case
# they will ever start being used
inherit (pkgs.waybar) buildInputs depsBuildBuild depsBuildBuildPropagated depsBuildTarget
depsBuildTargetPropagated depsHostHost depsHostHostPropagated depsTargetTarget
depsTargetTargetPropagated propagatedBuildInputs propagatedNativeBuildInputs strictDeps;

nativeBuildInputs = pkgs.waybar.nativeBuildInputs ++ (with pkgs; [
clang-tools
gdb
]);
};
});
};
}
21 changes: 19 additions & 2 deletions nix/default.nix
Original file line number Diff line number Diff line change
@@ -1,13 +1,30 @@
{ lib
, pkgs
, waybar
, version
}:

waybar.overrideAttrs (prev: {
let
catch2_3 = {
src = pkgs.fetchFromGitHub
{
owner = "catchorg";
repo = "Catch2";
rev = "v3.5.1";
hash = "sha256-OyYNUfnu6h1+MfCF8O+awQ4Usad0qrdCtdZhYgOY+Vw=";
};
};
in
(waybar.overrideAttrs (oldAttrs: rec {
inherit version;

src = lib.cleanSourceWith {
filter = name: type: type != "regular" || !lib.hasSuffix ".nix" name;
src = lib.cleanSource ../.;
};
})
).override {
catch2_3 = pkgs.catch2_3.overrideAttrs (oldAttrs: {
version = "3.5.1";
src = catch2_3.src;
});
}

0 comments on commit e609722

Please sign in to comment.