frobar: Better building method
This commit is contained in:
parent
d645ace45c
commit
577129cb1c
2 changed files with 29 additions and 13 deletions
|
@ -1,4 +1,5 @@
|
||||||
{
|
{
|
||||||
|
# nixpkgs ? <nixpkgs>,
|
||||||
# nixpkgs ? builtins.getFlake "github:GeoffreyFrogeye/nixpkgs/zelbar",
|
# nixpkgs ? builtins.getFlake "github:GeoffreyFrogeye/nixpkgs/zelbar",
|
||||||
nixpkgs ? /nix/store/8g86qw3c2fr56bhhvqznrlic4jig9hb3-source,
|
nixpkgs ? /nix/store/8g86qw3c2fr56bhhvqznrlic4jig9hb3-source,
|
||||||
pkgs ? import nixpkgs {
|
pkgs ? import nixpkgs {
|
||||||
|
@ -9,29 +10,44 @@
|
||||||
}:
|
}:
|
||||||
# Tried using pyproject.nix but mpd2 dependency wouldn't resolve,
|
# Tried using pyproject.nix but mpd2 dependency wouldn't resolve,
|
||||||
# is called pyton-mpd2 on PyPi but mpd2 in nixpkgs.
|
# is called pyton-mpd2 on PyPi but mpd2 in nixpkgs.
|
||||||
pkgs.python3Packages.buildPythonApplication rec {
|
pkgs.python3Packages.buildPythonPackage rec {
|
||||||
pname = "frobar";
|
pname = "frobar";
|
||||||
version = "3.0";
|
version = "3.1";
|
||||||
|
|
||||||
propagatedBuildInputs = with pkgs.python3Packages; [
|
dependencies = with pkgs.python3Packages; [
|
||||||
i3ipc
|
i3ipc
|
||||||
psutil
|
psutil
|
||||||
pulsectl-asyncio
|
pulsectl-asyncio
|
||||||
pygobject3
|
pygobject3
|
||||||
rich
|
rich
|
||||||
];
|
];
|
||||||
# TODO Might just be buildInputs, maybe without the need for prefix?
|
|
||||||
nativeBuildInputs = with pkgs; [
|
nativeBuildInputs = with pkgs; [
|
||||||
wirelesstools
|
wrapGAppsHook4
|
||||||
playerctl
|
gobject-introspection
|
||||||
zelbar
|
|
||||||
];
|
|
||||||
makeWrapperArgs = [
|
|
||||||
"--prefix PATH : ${pkgs.lib.makeBinPath nativeBuildInputs}"
|
|
||||||
"--prefix GI_TYPELIB_PATH : ${GI_TYPELIB_PATH}"
|
|
||||||
];
|
];
|
||||||
|
|
||||||
GI_TYPELIB_PATH = pkgs.lib.makeSearchPath "lib/girepository-1.0" [
|
buildInputs = with pkgs; [
|
||||||
|
playerctl
|
||||||
|
];
|
||||||
|
|
||||||
|
preFixup = ''
|
||||||
|
makeWrapperArgs+=(
|
||||||
|
''${gappsWrapperArgs[@]}
|
||||||
|
--prefix PATH : ${
|
||||||
|
pkgs.lib.makeBinPath (
|
||||||
|
with pkgs;
|
||||||
|
[
|
||||||
|
wirelesstools
|
||||||
|
zelbar
|
||||||
|
]
|
||||||
|
)
|
||||||
|
}
|
||||||
|
--prefix LD_LIBRARY_PATH : ${LD_LIBRARY_PATH}
|
||||||
|
)
|
||||||
|
'';
|
||||||
|
|
||||||
|
LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath [
|
||||||
pkgs.glib.out
|
pkgs.glib.out
|
||||||
pkgs.playerctl
|
pkgs.playerctl
|
||||||
];
|
];
|
||||||
|
|
|
@ -2,7 +2,7 @@ from setuptools import setup
|
||||||
|
|
||||||
setup(
|
setup(
|
||||||
name="frobar",
|
name="frobar",
|
||||||
version="3.0",
|
version="3.1",
|
||||||
install_requires=[
|
install_requires=[
|
||||||
"i3ipc",
|
"i3ipc",
|
||||||
"psutil",
|
"psutil",
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue