pyrox.dev
cups: remove xdg_utils dependency
`cups.desktop` that depends on some fixed version of `xdg-open` is not
particularly useful; it should use `xdg-open` from the environment
it's being run from.
As a side effect, one can now fiddle with `xdg_utils` package without
rebuilding pretty much every single one of graphical packages (they
all depend on `cups` through their graphical toolkits).
authored by Jan Malakhovski and committed by Luca Bruno c88e9def 844bfc60
+7
-4
pkgs/misc/cups/default.nix
+7
-4
pkgs/misc/cups/default.nix
···
1
{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam
2
-
, dbus, acl, gmp, xdg_utils
3
, libusb ? null, gnutls ? null, avahi ? null, libpaper ? null
4
}:
5
···
17
};
18
19
buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls avahi libpaper ]
20
-
++ optionals stdenv.isLinux [ pam dbus.libs acl xdg_utils ] ;
21
22
propagatedBuildInputs = [ gmp ];
23
···
54
"CUPS_PRIMARY_SYSTEM_GROUP=root"
55
];
56
57
-
postInstall =
58
-
''
59
# Delete obsolete stuff that conflicts with cups-filters.
60
rm -rf $out/share/cups/banners $out/share/cups/data/testprint
61
···
71
mv "$f" "''${f/org\.cups\./}"
72
fi
73
done
74
'';
75
76
meta = {
···
1
{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam
2
+
, dbus, acl, gmp
3
, libusb ? null, gnutls ? null, avahi ? null, libpaper ? null
4
}:
5
···
17
};
18
19
buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls avahi libpaper ]
20
+
++ optionals stdenv.isLinux [ pam dbus.libs acl ];
21
22
propagatedBuildInputs = [ gmp ];
23
···
54
"CUPS_PRIMARY_SYSTEM_GROUP=root"
55
];
56
57
+
postInstall = ''
58
# Delete obsolete stuff that conflicts with cups-filters.
59
rm -rf $out/share/cups/banners $out/share/cups/data/testprint
60
···
70
mv "$f" "''${f/org\.cups\./}"
71
fi
72
done
73
+
'' + optionalString stdenv.isLinux ''
74
+
# Use xdg-open when on Linux
75
+
substituteInPlace $out/share/applications/cups.desktop \
76
+
--replace "Exec=htmlview" "Exec=xdg-open"
77
'';
78
79
meta = {