all: embrace unit packages where possible
This commit is contained in:
@ -1,72 +0,0 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
|
||||
, pkg-config
|
||||
, alsaLib
|
||||
, dbus
|
||||
, openssl
|
||||
|
||||
# GUI
|
||||
, withGui ? true
|
||||
, copyDesktopItems
|
||||
, makeDesktopItem
|
||||
, gtk3
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (lib) optional optionals;
|
||||
in
|
||||
|
||||
assert withGui -> gtk3.meta.available;
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "psst";
|
||||
version = "20221012.d70ed81";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jpochyla";
|
||||
repo = "psst";
|
||||
rev = "d70ed8104533dc15bc36b989ba8428872c9b578f";
|
||||
hash = "sha256-ZKhHN0ruLb6ZVKkrKv/YawRsVop6SP1QF/nrtkmA8P8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
cargoSha256 = "sha256-zH6+EV78FDVOYEFXk0f54pH2Su0QpK1I0bHqzIiMdBo=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ]
|
||||
++ optional withGui copyDesktopItems;
|
||||
|
||||
buildInputs = [ alsaLib dbus openssl ]
|
||||
++ optional withGui gtk3;
|
||||
|
||||
cargoBuildFlags = optionals (!withGui) [
|
||||
"--workspace"
|
||||
"--exclude"
|
||||
"psst-gui"
|
||||
];
|
||||
|
||||
# Unable to exclude targets from the check phase as it doesn't respect
|
||||
# `cargoBuildFlags`; to save from attempting to build the GUI without meaning
|
||||
# to, don't bother checking for CLI-only builds.
|
||||
# https://github.com/NixOS/nixpkgs/blob/77d190f10931c1d06d87bf6d772bf65346c71777/pkgs/build-support/rust/default.nix#L241
|
||||
doCheck = withGui;
|
||||
|
||||
desktopItems = optionals withGui [
|
||||
(makeDesktopItem {
|
||||
name = pname;
|
||||
desktopName = "psst";
|
||||
genericName = "Spotify Player";
|
||||
categories = [ "AudioVideo" "Audio" "Network" "Player" ];
|
||||
comment = "Spotify client with native GUI";
|
||||
exec = "psst-gui";
|
||||
keywords = [ "spotify" "music" ];
|
||||
icon = "spotify";
|
||||
type = "Application";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast and multi-platform Spotify client with native GUI ";
|
||||
homepage = "https://github.com/jpochyla/psst";
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
@ -1,55 +0,0 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
|
||||
, alacritty
|
||||
|
||||
, fontconfig
|
||||
, freetype
|
||||
, libglvnd
|
||||
, libxcb
|
||||
}:
|
||||
|
||||
alacritty.overrideAttrs (oldAttrs: rec {
|
||||
pname = "${oldAttrs.pname}-ligatures";
|
||||
version = "0.7.2.20210209.g3ed0430";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zenixls2";
|
||||
repo = "alacritty";
|
||||
fetchSubmodules = true;
|
||||
rev = "3ed043046fc74f288d4c8fa7e4463dc201213500";
|
||||
sha256 = "1dGk4ORzMSUQhuKSt5Yo7rOJCJ5/folwPX2tLiu0suA=";
|
||||
};
|
||||
|
||||
cargoDeps = oldAttrs.cargoDeps.overrideAttrs (lib.const {
|
||||
name = "${pname}-${version}-vendor.tar.gz";
|
||||
inherit src;
|
||||
outputHash = "pONu6caJmEKnbr7j+o9AyrYNpS4Q8OEjNZOhGTalncc=";
|
||||
});
|
||||
|
||||
ligatureInputs = [
|
||||
fontconfig
|
||||
freetype
|
||||
libglvnd
|
||||
stdenv.cc.cc.lib
|
||||
libxcb
|
||||
];
|
||||
|
||||
preferLocalBuild = true;
|
||||
|
||||
buildInputs = (oldAttrs.buildInputs or [ ]) ++ ligatureInputs;
|
||||
|
||||
# HACK: One of the ligature libraries required the C++ stdlib at runtime,
|
||||
# and I can't work out a better way to push it to the RPATH.
|
||||
postInstall = lib.optional (!stdenv.isDarwin) ''
|
||||
patchelf \
|
||||
--set-rpath ${lib.makeLibraryPath ligatureInputs}:"$(patchelf --print-rpath $out/bin/alacritty)" \
|
||||
$out/bin/alacritty
|
||||
'';
|
||||
|
||||
meta = oldAttrs.meta // {
|
||||
description = "Alacritty with ligature patch applied";
|
||||
homepage = "https://github.com/zenixls2/alacritty/tree/ligature";
|
||||
};
|
||||
})
|
@ -1,62 +0,0 @@
|
||||
diff --git a/cardboard/meson.build b/cardboard/meson.build
|
||||
index b236f71..a90f230 100644
|
||||
--- a/cardboard/meson.build
|
||||
+++ b/cardboard/meson.build
|
||||
@@ -4,24 +4,15 @@ xkbcommon = dependency('xkbcommon')
|
||||
xcb = dependency('xcb', required: get_option('xwayland'))
|
||||
|
||||
wlroots_version = '>=0.10.0'
|
||||
-wlroots_proj = subproject(
|
||||
+wlroots = dependency(
|
||||
'wlroots',
|
||||
- default_options: ['examples=false'],
|
||||
required: true,
|
||||
version: wlroots_version,
|
||||
)
|
||||
|
||||
-wlroots = wlroots_proj.get_variable('wlroots')
|
||||
-wlroots_conf = wlroots_proj.get_variable('conf_data')
|
||||
-wlroots_has_xwayland = wlroots_conf.get('WLR_HAS_XWAYLAND') == 1
|
||||
+have_xwayland = xcb.found()
|
||||
|
||||
-if get_option('xwayland').enabled() and not wlroots_has_xwayland
|
||||
- error('Cannot enable Xwayland support in cardboard: wlroots has been built without Xwayland support')
|
||||
-endif
|
||||
-have_xwayland = xcb.found() and wlroots_has_xwayland
|
||||
-
|
||||
-expected_proj = subproject('expected', required: true)
|
||||
-expected = expected_proj.get_variable('expected_dep')
|
||||
+expected = dependency('tl-expected', required: true, method: 'cmake', modules: ['tl::expected'])
|
||||
|
||||
conf_data = configuration_data()
|
||||
conf_data.set10('HAVE_XWAYLAND', have_xwayland)
|
||||
diff --git a/cutter/meson.build b/cutter/meson.build
|
||||
index f1260a4..1485f37 100644
|
||||
--- a/cutter/meson.build
|
||||
+++ b/cutter/meson.build
|
||||
@@ -1,6 +1,5 @@
|
||||
# SPDX-License-Identifier: GPL-3.0-only
|
||||
-expected_proj = subproject('expected', required: true)
|
||||
-expected = expected_proj.get_variable('expected_dep')
|
||||
+expected = dependency('tl-expected', required: true, method: 'cmake', modules: ['tl::expected'])
|
||||
|
||||
executable(
|
||||
'cutter',
|
||||
diff --git a/libcardboard/meson.build b/libcardboard/meson.build
|
||||
index 89698fe..3ac8115 100644
|
||||
--- a/libcardboard/meson.build
|
||||
+++ b/libcardboard/meson.build
|
||||
@@ -1,11 +1,9 @@
|
||||
# SPDX-License-Identifier: GPL-3.0-only
|
||||
libcardboard_inc = include_directories('include')
|
||||
|
||||
-expected_proj = subproject('expected', required: true)
|
||||
-expected = expected_proj.get_variable('expected_dep')
|
||||
+expected = dependency('tl-expected', required: true, method: 'cmake', modules: ['tl::expected'])
|
||||
|
||||
-cereal_proj = subproject('cereal', required: true)
|
||||
-cereal = cereal_proj.get_variable('cereal_dep')
|
||||
+cereal = dependency('cereal', required: true, method: 'cmake')
|
||||
|
||||
sources = files(
|
||||
'src/command_protocol.cpp',
|
@ -1,69 +0,0 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitLab
|
||||
, cereal
|
||||
, cmake
|
||||
, libGL
|
||||
, libX11
|
||||
, libinput
|
||||
, libxkbcommon
|
||||
, meson
|
||||
, ninja
|
||||
, pixman
|
||||
, pkg-config
|
||||
, tl-expected
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, wlroots
|
||||
, xwayland
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cardboard";
|
||||
version = "20210120.g7b15613";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "cardboardwm";
|
||||
repo = "cardboard";
|
||||
rev = "7b15613e6e1222a6a83d69a2e5da2810dfb45522";
|
||||
sha256 = "044sb0lv1gcywpdncvlv7npxvbsqcc1mwpk0f6i73dinchdz7gmq";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0001-use-system-dependencies.patch
|
||||
];
|
||||
|
||||
# CMake likes to own the configurePhase, but we only need it for dependency
|
||||
# discovery. Remove it.
|
||||
configurePhase = "mesonConfigurePhase";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
cereal
|
||||
libGL
|
||||
libX11
|
||||
libinput
|
||||
libxkbcommon
|
||||
pixman
|
||||
tl-expected
|
||||
wayland
|
||||
wayland-protocols
|
||||
wlroots
|
||||
];
|
||||
|
||||
passthru.providedSessions = [ "cardboard" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Scrollable tiling Wayland compositor designed with laptops in mind";
|
||||
homepage = "https://gitlab.com/cardboardwm/cardboard";
|
||||
license = licenses.gpl3;
|
||||
platforms = wlroots.meta.platforms;
|
||||
broken = true;
|
||||
};
|
||||
}
|
Reference in New Issue
Block a user