simple-scan: makeWrapper -> wrapGAppsHook
This commit is contained in:
parent
2ce24737c8
commit
120f8eef67
@ -1,5 +1,5 @@
|
|||||||
{ stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool, libusb
|
{ stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool, libusb
|
||||||
, libxml2, makeWrapper, pkgconfig, saneBackends, systemd, vala }:
|
, libxml2, pkgconfig, saneBackends, systemd, vala, wrapGAppsHook }:
|
||||||
|
|
||||||
let version = "3.19.2"; in
|
let version = "3.19.2"; in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
buildInputs = [ cairo colord glib gusb gtk3 libusb libxml2 saneBackends
|
buildInputs = [ cairo colord glib gusb gtk3 libusb libxml2 saneBackends
|
||||||
systemd vala ];
|
systemd vala ];
|
||||||
nativeBuildInputs = [ intltool itstool makeWrapper pkgconfig ];
|
nativeBuildInputs = [ intltool itstool pkgconfig wrapGAppsHook ];
|
||||||
|
|
||||||
configureFlags = [ "--disable-packagekit" ];
|
configureFlags = [ "--disable-packagekit" ];
|
||||||
|
|
||||||
@ -25,11 +25,6 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
preFixup = ''
|
|
||||||
wrapProgram "$out/bin/simple-scan" \
|
|
||||||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
inherit version;
|
inherit version;
|
||||||
description = "Simple scanning utility";
|
description = "Simple scanning utility";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user