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

lib.makePerlPath -> perlPackages.makePerlPath

Browse Source
This commit is contained in:
volth
2018-12-15 03:50:31 +00:00
parent 921d046537
commit bb9557eb7c
81 changed files with 313 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/graphics/shutter/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, perlPackages, makeWrapper, imagemagick, gdk_pixbuf, librsvg
{ stdenv, fetchurl, perlPackages, makeWrapper, imagemagick, gdk_pixbuf, librsvg
, hicolor-icon-theme, procps
}:
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ perl procps gdk_pixbuf librsvg ] ++ perlModules;
buildInputs = [ perlPackages.perl procps gdk_pixbuf librsvg ] ++ perlModules;
installPhase = ''
mkdir -p "$out"
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
(cd "$out" && mv CHANGES README COPYING "$out/share/doc/shutter")
wrapProgram $out/bin/shutter \
--set PERL5LIB "${stdenv.lib.makePerlPath perlModules}" \
--set PERL5LIB "${perlPackages.makePerlPath perlModules}" \
--prefix PATH : "${imagemagick.out}/bin" \
--suffix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"