hplip: replace preConfigure with a nicer approach
The newlines were a problem at *this* moment: https://github.com/NixOS/nixpkgs/commit/c335a18e#commitcomment-53611461 but let's make the hplip expression nicer regardless of how that ends.
This commit is contained in:
parent
ee007cdc35
commit
2ae4f06e4f
@ -123,36 +123,35 @@ python3Packages.buildPythonApplication {
|
||||
{} +
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
export configureFlags="$configureFlags
|
||||
--with-hpppddir=$out/share/cups/model/HP
|
||||
--with-cupsfilterdir=$out/lib/cups/filter
|
||||
--with-cupsbackenddir=$out/lib/cups/backend
|
||||
--with-icondir=$out/share/applications
|
||||
--with-systraydir=$out/xdg/autostart
|
||||
--with-mimedir=$out/etc/cups
|
||||
--enable-policykit
|
||||
${lib.optionalString withStaticPPDInstall "--enable-cups-ppd-install"}
|
||||
--disable-qt4
|
||||
${lib.optionalString withQt5 "--enable-qt5"}
|
||||
"
|
||||
configureFlags = let out = placeholder "out"; in [
|
||||
"--with-hpppddir=${out}/share/cups/model/HP"
|
||||
"--with-cupsfilterdir=${out}/lib/cups/filter"
|
||||
"--with-cupsbackenddir=${out}/lib/cups/backend"
|
||||
"--with-icondir=${out}/share/applications"
|
||||
"--with-systraydir=${out}/xdg/autostart"
|
||||
"--with-mimedir=${out}/etc/cups"
|
||||
"--enable-policykit"
|
||||
"--disable-qt4"
|
||||
]
|
||||
++ lib.optional withStaticPPDInstall "--enable-cups-ppd-install"
|
||||
++ lib.optional withQt5 "--enable-qt5"
|
||||
;
|
||||
|
||||
export makeFlags="
|
||||
halpredir=$out/share/hal/fdi/preprobe/10osvendor
|
||||
rulesdir=$out/etc/udev/rules.d
|
||||
policykit_dir=$out/share/polkit-1/actions
|
||||
policykit_dbus_etcdir=$out/etc/dbus-1/system.d
|
||||
policykit_dbus_sharedir=$out/share/dbus-1/system-services
|
||||
hplip_confdir=$out/etc/hp
|
||||
hplip_statedir=$out/var/lib/hp
|
||||
"
|
||||
# Prevent 'ppdc: Unable to find include file "<font.defs>"' which prevent
|
||||
# generation of '*.ppd' files.
|
||||
# This seems to be a 'ppdc' issue when the tool is run in a hermetic sandbox.
|
||||
# Could not find how to fix the problem in 'ppdc' so this is a workaround.
|
||||
CUPS_DATADIR = "${cups}/share/cups";
|
||||
|
||||
# Prevent 'ppdc: Unable to find include file "<font.defs>"' which prevent
|
||||
# generation of '*.ppd' files.
|
||||
# This seems to be a 'ppdc' issue when the tool is run in a hermetic sandbox.
|
||||
# Could not find how to fix the problem in 'ppdc' so this is a workaround.
|
||||
export CUPS_DATADIR="${cups}/share/cups"
|
||||
'';
|
||||
makeFlags = let out = placeholder "out"; in [
|
||||
"halpredir=${out}/share/hal/fdi/preprobe/10osvendor"
|
||||
"rulesdir=${out}/etc/udev/rules.d"
|
||||
"policykit_dir=${out}/share/polkit-1/actions"
|
||||
"policykit_dbus_etcdir=${out}/etc/dbus-1/system.d"
|
||||
"policykit_dbus_sharedir=${out}/share/dbus-1/system-services"
|
||||
"hplip_confdir=${out}/etc/hp"
|
||||
"hplip_statedir=${out}/var/lib/hp"
|
||||
];
|
||||
|
||||
postConfigure = ''
|
||||
# don't save timestamp, in order to improve reproducibility
|
||||
|
Loading…
Reference in New Issue
Block a user