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

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

Browse Source 
system-config-printer: fix python path
This commit is contained in:
Jörg Thalheim 2017-11-25 14:17:22 +00:00 committed by GitHub
commit 03207c067c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 34 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,49 +18,47 @@ 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 ];
pythonPath = with pythonPackages; requiredPythonModules [ pycups pycurl dbus-python pygobject3 requests pycairo pysmbc ]; configureFlags = [
"--with-udev-rules"
configureFlags = "--with-udevdir=$(out)/etc/udev"
[ "--with-udev-rules" "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
"--with-udevdir=$(out)/etc/udev" ];
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
];
stripDebugList = [ "bin" "lib" "etc/udev" ]; stripDebugList = [ "bin" "lib" "etc/udev" ];
postInstall = postInstall = ''
'' gappsWrapperArgs+=(
buildPythonPath "$out $pythonPath" --prefix PATH : "$program_PATH"
gappsWrapperArgs+=( --prefix PYTHONPATH : "$out/${pythonPackages.python.sitePackages}"
--prefix PATH : "$program_PATH" --set CUPS_DATADIR "${cups-filters}/share/cups"
--set CUPS_DATADIR "${cups-filters}/share/cups" )
)
find $out/share/system-config-printer -name \*.py -type f -perm -0100 -print0 | while read -d "" f; do # The below line will be unneeded when the next upstream release arrives.
patchPythonScript "$f" sed -i -e "s|/usr/local/bin|$out/bin|" \
done "$out/share/dbus-1/services/org.fedoraproject.Config.Printing.service"
# The below line will be unneeded when the next upstream release arrives. # Manually expand literal "$(out)", which have failed to expand
sed -i -e "s|/usr/local/bin|$out/bin|" "$out/share/dbus-1/services/org.fedoraproject.Config.Printing.service" sed -e "s|ExecStart=\$(out)|ExecStart=$out|" \
-i "$out/etc/systemd/system/configure-printer@.service"
'';
# Manually expand literal "$(out)", which have failed to expand meta = with stdenv.lib; {
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 = stdenv.lib.platforms.linux; platforms = platforms.linux;
license = stdenv.lib.licenses.gpl2; license = licenses.gpl2;
}; };
} }