bhrebec/xwayland-satellite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor flake for overridability, conditional service install, version formatting (#65)

Browse source 
* Refactor flake for overridability, conditional service install, version formatting

* Disable default cargo features for the flake package

Co-authored-by: sodiboo <37938646+sodiboo@users.noreply.github.com>

* Replace deprecated `--replace` with `--replace-fail` in the flake package

Co-authored-by: sodiboo <37938646+sodiboo@users.noreply.github.com>

* Remove `unstable` from flake package version

Co-authored-by: sodiboo <37938646+sodiboo@users.noreply.github.com>

* Refactor flake to enable dependency overridability

* Pass lib explicitly in flake package

* Fix incorrect package path in flake package dependency

* Replace makeWrapper with makeBinaryWrapper

* Enhance build by separating substitution, service install, and wrapping

* Remove redundant arguments from package call

---------

Co-authored-by: sodiboo <37938646+sodiboo@users.noreply.github.com>
This commit is contained in:
e-tho 2024-10-27 22:59:15 +01:00 • committed by GitHub
parent 67efa2c559
commit 4e85e8c69e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 63 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

86
flake.nix
View file

@ -6,46 +6,83 @@
url = "github:oxalica/rust-overlay";
inputs.nixpkgs.follows = "nixpkgs";
};
naersk.url = "github:nix-community/naersk";
};
outputs = { self, nixpkgs, rust-overlay, naersk, flake-utils }:
outputs = { self, nixpkgs, rust-overlay, flake-utils }:
let systems = [ "x86_64-linux" "aarch64-linux" ];
in flake-utils.lib.eachSystem systems (system:
let
overlays = [ (import rust-overlay) ];
pkgs = import nixpkgs { inherit system overlays; };
lib = pkgs.lib;
naersk' = pkgs.callPackage naersk {
cargo = pkgs.rust-bin.stable.latest.default;
rustc = pkgs.rust-bin.stable.latest.default;
cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml);
cargoPackageVersion = cargoToml.package.version;
commitHash = self.shortRev or self.dirtyShortRev or "unknown";
version = "${cargoPackageVersion}-${commitHash}";
buildXwaylandSatellite =
{ lib
, rustPlatform
, pkg-config
, makeBinaryWrapper
, libxcb
, xcb-util-cursor
, xwayland
, withSystemd ? true
}:
rustPlatform.buildRustPackage rec {
pname = "xwayland-satellite";
inherit version;
src = self;
cargoLock = {
lockFile = "${src}/Cargo.lock";
allowBuiltinFetchGit = true;
};
buildXwaylandSatellite = { withSystemd ? false }: naersk'.buildPackage {
src = ./.;
nativeBuildInputs = with pkgs; [
nativeBuildInputs = [
rustPlatform.bindgenHook
rust-bin.stable.latest.default
pkg-config
makeBinaryWrapper
];
buildInputs = [
libxcb
xcb-util-cursor
xorg.libxcb
];
makeWrapper
] ++ lib.optional withSystemd pkgs.systemd;
buildNoDefaultFeatures = true;
buildFeatures = lib.optionals withSystemd [ "systemd" ];
buildInputs = [ pkgs.xwayland ];
cargoBuildOptions = opts: opts ++ lib.optional withSystemd "--features systemd";
postInstall = ''
wrapProgram $out/bin/xwayland-satellite \
--prefix PATH : ${pkgs.xwayland}/bin
postPatch = ''
substituteInPlace resources/xwayland-satellite.service \
--replace-fail '/usr/local/bin' "$out/bin"
'';
postInstall = lib.optionalString withSystemd ''
install -Dm0644 resources/xwayland-satellite.service -t $out/lib/systemd/user
'';
postFixup = ''
wrapProgram $out/bin/xwayland-satellite \
--prefix PATH : "${lib.makeBinPath [ xwayland ]}"
'';
doCheck = false;
meta = with lib; {
description = "Xwayland outside your Wayland";
homepage = "https://github.com/Supreeeme/xwayland-satellite";
license = licenses.mpl20;
platforms = platforms.linux;
};
};
xwayland-satellite = pkgs.callPackage buildXwaylandSatellite { };
in
{
devShell = (pkgs.mkShell.override { stdenv = pkgs.clangStdenv; }) {
@ -60,11 +97,8 @@
];
};
packages = rec {
xwayland-satellite-nosd = buildXwaylandSatellite { withSystemd = false; };
xwayland-satellite = buildXwaylandSatellite { withSystemd = true; };
packages = {
xwayland-satellite = xwayland-satellite;
default = xwayland-satellite;
};
});