JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Merge pull request #32024 from andir/unstable-fix-gnome3-printing"

Browse Source 
This reverts commit 03207c067c, reversing
changes made to 822342ffdf.

Reverted because the change was not needed anymore:
https://github.com/NixOS/nixpkgs/pull/32024#issuecomment-346947664
This commit is contained in:
Frederik Rietdijk 2017-11-26 09:15:39 +01:00
parent d8473c35df
commit f83bb7d1ea
1 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
pkgs/tools/misc/system-config-printer/default.nix
View File

@ -18,47 +18,49 @@ stdenv.mkDerivation rec {
patches = [ ./detect_serverbindir.patch ]; patches = [ ./detect_serverbindir.patch ];
buildInputs = [ buildInputs =
intltool pkgconfig glib udev libusb1 cups xmlto [ intltool pkgconfig glib udev libusb1 cups xmlto
libxml2 docbook_xml_dtd_412 docbook_xsl desktop_file_utils libxml2 docbook_xml_dtd_412 docbook_xsl desktop_file_utils
pythonPackages.python pythonPackages.wrapPython
libnotify gobjectIntrospection gdk_pixbuf pango atk libnotify gobjectIntrospection gdk_pixbuf pango atk
libgnome_keyring3 libgnome_keyring3
];
(pythonPackages.python.withPackages (ps: with ps; [
pycups pycurl dbus-python pygobject3 requests pycairo pysmbc
]))
];
nativeBuildInputs = [ wrapGAppsHook ]; nativeBuildInputs = [ wrapGAppsHook ];
configureFlags = [ pythonPath = with pythonPackages; requiredPythonModules [ pycups pycurl dbus-python pygobject3 requests pycairo pysmbc ];
"--with-udev-rules"
"--with-udevdir=$(out)/etc/udev" configureFlags =
"--with-systemdsystemunitdir=$(out)/etc/systemd/system" [ "--with-udev-rules"
]; "--with-udevdir=$(out)/etc/udev"
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
];
stripDebugList = [ "bin" "lib" "etc/udev" ]; stripDebugList = [ "bin" "lib" "etc/udev" ];
postInstall = '' postInstall =
gappsWrapperArgs+=( ''
--prefix PATH : "$program_PATH" buildPythonPath "$out $pythonPath"
--prefix PYTHONPATH : "$out/${pythonPackages.python.sitePackages}" gappsWrapperArgs+=(
--set CUPS_DATADIR "${cups-filters}/share/cups" --prefix PATH : "$program_PATH"
) --set CUPS_DATADIR "${cups-filters}/share/cups"
)
# The below line will be unneeded when the next upstream release arrives. find $out/share/system-config-printer -name \*.py -type f -perm -0100 -print0 | while read -d "" f; do
sed -i -e "s|/usr/local/bin|$out/bin|" \ patchPythonScript "$f"
"$out/share/dbus-1/services/org.fedoraproject.Config.Printing.service" done
# Manually expand literal "$(out)", which have failed to expand # The below line will be unneeded when the next upstream release arrives.
sed -e "s|ExecStart=\$(out)|ExecStart=$out|" \ sed -i -e "s|/usr/local/bin|$out/bin|" "$out/share/dbus-1/services/org.fedoraproject.Config.Printing.service"
-i "$out/etc/systemd/system/configure-printer@.service"
'';
meta = with stdenv.lib; { # Manually expand literal "$(out)", which have failed to expand
sed -e "s|ExecStart=\$(out)|ExecStart=$out|" \
-i "$out/etc/systemd/system/configure-printer@.service"
'';
meta = {
homepage = http://cyberelk.net/tim/software/system-config-printer/; homepage = http://cyberelk.net/tim/software/system-config-printer/;
platforms = platforms.linux; platforms = stdenv.lib.platforms.linux;
license = licenses.gpl2; license = stdenv.lib.licenses.gpl2;
}; };
} }