ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-22 13:08:39 +03:00
Code Issues Projects Releases Wiki Activity

cups: remove with lib over entire file

Browse Source
This commit is contained in:
Sandro Jäckel 2023-01-23 22:45:25 +01:00
parent 1c18d9a5fb
commit 09e07a3ad3
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/misc/cups/default.nix
View File

@ -22,10 +22,8 @@
, nixosTests
}:
with lib;
stdenv.mkDerivation rec {
pname = "cups";
version = "2.4.2";
src = fetchurl {
@ -48,9 +46,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config removeReferencesTo ];
buildInputs = [ zlib libjpeg libpng libtiff libusb1 gnutls libpaper ]
++ optionals stdenv.isLinux [ avahi pam dbus acl ]
++ optional enableSystemd systemd
++ optionals stdenv.isDarwin (with darwin; [
++ lib.optionals stdenv.isLinux [ avahi pam dbus acl ]
++ lib.optional enableSystemd systemd
++ lib.optionals stdenv.isDarwin (with darwin; [
configd apple_sdk.frameworks.ApplicationServices
]);
@ -62,18 +60,18 @@ stdenv.mkDerivation rec {
"--sysconfdir=/etc"
"--enable-raw-printing"
"--enable-threads"
] ++ optionals stdenv.isLinux [
] ++ lib.optionals stdenv.isLinux [
"--enable-dbus"
"--enable-pam"
"--with-dbusdir=${placeholder "out"}/share/dbus-1"
] ++ optional (libusb1 != null) "--enable-libusb"
++ optional (gnutls != null) "--enable-ssl"
++ optional (avahi != null) "--enable-avahi"
++ optional (libpaper != null) "--enable-libpaper";
] ++ lib.optional (libusb1 != null) "--enable-libusb"
++ lib.optional (gnutls != null) "--enable-ssl"
++ lib.optional (avahi != null) "--enable-avahi"
++ lib.optional (libpaper != null) "--enable-libpaper";
# AR has to be an absolute path
preConfigure = ''
export AR="${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar"
export AR="${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar"
configureFlagsArray+=(
# Put just lib/* and locale into $lib; this didn't work directly.
# lib/cups is moved back to $out in postInstall.
@ -84,7 +82,7 @@ stdenv.mkDerivation rec {
"--with-systemd=$out/lib/systemd/system"
${optionalString stdenv.isDarwin ''
${lib.optionalString stdenv.isDarwin ''
"--with-bundledir=$out"
''}
)
@ -130,7 +128,7 @@ stdenv.mkDerivation rec {
for f in "$out"/lib/systemd/system/*; do
substituteInPlace "$f" --replace "$lib/$libexec" "$out/$libexec"
done
'' + optionalString stdenv.isLinux ''
'' + lib.optionalString stdenv.isLinux ''
# Use xdg-open when on Linux
substituteInPlace "$out"/share/applications/cups.desktop \
--replace "Exec=htmlview" "Exec=xdg-open"
@ -138,7 +136,7 @@ stdenv.mkDerivation rec {
passthru.tests.nixos = nixosTests.printing;
meta = {
meta = with lib; {
homepage = "https://openprinting.github.io/cups/";
description = "A standards-based printing system for UNIX";
license = licenses.asl20;