1
This commit is contained in:
2023-04-26 12:56:31 +02:00
parent 1b83c0131f
commit 9a457490d4
39 changed files with 308 additions and 316 deletions

View File

@ -4,59 +4,59 @@
fetchurl,
autoPatchelfHook,
cups,
libusb1
libusb1,
}:
stdenv.mkDerivation rec {
pname = "B1160_B1160w_UnifiedLinuxDriver";
version = "1.01";
pname = "B1160_B1160w_UnifiedLinuxDriver";
version = "1.01";
src = fetchurl {
url = "https://dl.dell.com/FOLDER00947576M/1/${pname}_${version}.tar.gz";
sha256 = "10b75a899ba7aff3b95158f6fc49f09d6eef670608480ee48c179337c5337375";
curlOptsList = ["--user-agent" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:89.0) Gecko/20100101 Firefox/89.0"];
};
src = fetchurl {
url = "https://dl.dell.com/FOLDER00947576M/1/${pname}_${version}.tar.gz";
sha256 = "10b75a899ba7aff3b95158f6fc49f09d6eef670608480ee48c179337c5337375";
curlOptsList = ["--user-agent" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:89.0) Gecko/20100101 Firefox/89.0"];
};
# https://nixos.org/manual/nixpkgs/unstable/#setup-hook-autopatchelfhook
# https://nixos.wiki/wiki/Packaging/Binaries
# https://unix.stackexchange.com/questions/522822/different-methods-to-run-a-non-nixos-executable-on-nixos/522823#522823
# TODO: This step does not work
nativeBuildInputs = [
cups
stdenv.cc.cc.lib
libusb1
autoPatchelfHook
];
# https://nixos.org/manual/nixpkgs/unstable/#setup-hook-autopatchelfhook
# https://nixos.wiki/wiki/Packaging/Binaries
# https://unix.stackexchange.com/questions/522822/different-methods-to-run-a-non-nixos-executable-on-nixos/522823#522823
# TODO: This step does not work
nativeBuildInputs = [
cups
stdenv.cc.cc.lib
libusb1
autoPatchelfHook
];
unpackCmd = ''
mkdir -p root
tar xvf $curSrc --directory=root
'';
unpackCmd = ''
mkdir -p root
tar xvf $curSrc --directory=root
'';
# This is already built
dontBuild = true;
# This is already built
dontBuild = true;
installPhase = ''
runHook preInstall
installPhase = ''
runHook preInstall
mkdir -p $out
mkdir -p $out/cups
mkdir -p $out/lib
mkdir -p $out/lib64
mkdir -p $out/sbin
mkdir -p $out
mkdir -p $out/cups
mkdir -p $out/lib
mkdir -p $out/lib64
mkdir -p $out/sbin
cp -r cdroot/Linux/x86_64/at_root/usr/sbin/* $out/sbin/
cp -r cdroot/Linux/x86_64/at_root/usr/lib64/*.so.* $out/lib64/
cp -r cdroot/Linux/x86_64/at_root/usr/lib64/cups/* $out/cups/
cp -r cdroot/Linux/x86_64/at_root/opt/smfp-common/lib/* $out/lib/
runHook postInstall
'';
cp -r cdroot/Linux/x86_64/at_root/usr/sbin/* $out/sbin/
cp -r cdroot/Linux/x86_64/at_root/usr/lib64/*.so.* $out/lib64/
cp -r cdroot/Linux/x86_64/at_root/usr/lib64/cups/* $out/cups/
cp -r cdroot/Linux/x86_64/at_root/opt/smfp-common/lib/* $out/lib/
meta = with lib; {
description = "CUPS driver for the Dell B1160w printer.";
longDescription = "CUPS driver for the Dell B1160w printer.";
homepage = "https://www.dell.com/support/home/de-de/drivers/driversdetails?driverid=1m4pc";
license = licenses.unfree;
platforms = ["x86_64-linux"];
};
}
runHook postInstall
'';
meta = with lib; {
description = "CUPS driver for the Dell B1160w printer.";
longDescription = "CUPS driver for the Dell B1160w printer.";
homepage = "https://www.dell.com/support/home/de-de/drivers/driversdetails?driverid=1m4pc";
license = licenses.unfree;
platforms = ["x86_64-linux"];
};
}

View File

@ -1,9 +1,9 @@
{ lib
, python310
, fetchFromGitHub
, ffmpeg
{
lib,
python310,
fetchFromGitHub,
ffmpeg,
}:
python310.pkgs.buildPythonApplication rec {
pname = "spotdl";
version = "4.1.6";
@ -83,7 +83,10 @@ python310.pkgs.buildPythonApplication rec {
];
makeWrapperArgs = [
"--prefix" "PATH" ":" (lib.makeBinPath [ ffmpeg ])
"--prefix"
"PATH"
":"
(lib.makeBinPath [ffmpeg])
];
meta = with lib; {
@ -91,6 +94,6 @@ python310.pkgs.buildPythonApplication rec {
homepage = "https://github.com/spotDL/spotify-downloader";
changelog = "https://github.com/spotDL/spotify-downloader/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
maintainers = with maintainers; [dotlambda];
};
}

View File

@ -1,25 +1,25 @@
# NOTE: Adapted from nixpkgs xdg-desktop-portal-wlr derivation
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, makeWrapper
, meson
, ninja
, pkg-config
, wayland-protocols
, wayland-scanner
# , grim
, inih
, libdrm
, mesa
, pipewire
, scdoc
# , slurp
, systemd
, wayland
{
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
makeWrapper,
meson,
ninja,
pkg-config,
wayland-protocols,
wayland-scanner,
# , grim
inih,
libdrm,
mesa,
pipewire,
scdoc,
# , slurp
systemd,
wayland,
}:
stdenv.mkDerivation rec {
pname = "xdg-desktop-portal-termfilechooser";
version = "0.1.0";
@ -39,15 +39,17 @@ stdenv.mkDerivation rec {
# })];
# Add hyprland to portal metainformation
patches = [(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/GermainZ/xdg-desktop-portal-termfilechooser/pull/6.patch";
hash = "sha256-GjK6GL15liHYm5U0XBSIf5H8Cc4RIWBD0O47lLWcep0=";
})];
patches = [
(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/GermainZ/xdg-desktop-portal-termfilechooser/pull/6.patch";
hash = "sha256-GjK6GL15liHYm5U0XBSIf5H8Cc4RIWBD0O47lLWcep0=";
})
];
strictDeps = true;
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner makeWrapper ];
buildInputs = [ inih libdrm mesa pipewire systemd wayland wayland-protocols ];
depsBuildBuild = [pkg-config];
nativeBuildInputs = [meson ninja pkg-config scdoc wayland-scanner makeWrapper];
buildInputs = [inih libdrm mesa pipewire systemd wayland wayland-protocols];
mesonFlags = [
"-Dsd-bus-provider=libsystemd"
@ -62,4 +64,4 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
license = licenses.mit;
};
}
}