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

Merge pull request #109434 from siraben/pkgs-tools-stdenv

Browse Source 
pkgs/tools: stdenv.lib -> lib
This commit is contained in:
Jörg Thalheim
2021-01-15 10:48:18 +00:00
committed by GitHub
parent dc7dd23241 8c5d37129f
commit 147270c1c9
916 changed files with 2510 additions and 2510 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/graphics/asymptote/default.nix
+3 -3
View File
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
};
patches =
(stdenv.lib.optional (stdenv.lib.versionOlder version "2.68")
(lib.optional (stdenv.lib.versionOlder version "2.68")
(fetchpatch {
url = "https://github.com/vectorgraphics/asymptote/commit/3361214340d58235f4dbb8f24017d0cd5d94da72.patch";
sha256 = "sha256:1z2b41x8v7683myd45lq6niixpdjy0b185x0xl61130vrijhq5nm";
@@ -47,9 +47,9 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [
glm
] ++ stdenv.lib.optionals stdenv.isLinux [
] ++ lib.optionals stdenv.isLinux [
freeglut libGLU libGL mesa.osmesa
] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
OpenGL GLUT Cocoa
]);
pkgs/tools/graphics/briss/default.nix
+3 -3
View File
@@ -1,6 +1,6 @@
# The releases of this project are apparently precompiled to .jar files.
{ stdenv, fetchurl, jre, makeWrapper }:
{ lib, stdenv, fetchurl, jre, makeWrapper }:
let
@@ -27,7 +27,7 @@ in stdenv.mkDerivation {
meta = {
homepage = "https://sourceforge.net/projects/briss/";
description = "Java application for cropping PDF files";
license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.unix;
license = lib.licenses.gpl3;
platforms = lib.platforms.unix;
};
}
pkgs/tools/graphics/convchain/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{stdenv, fetchFromGitHub, mono}:
{lib, stdenv, fetchFromGitHub, mono}:
stdenv.mkDerivation rec {
pname = "convchain";
version = "0.0pre20160901";
@@ -33,8 +33,8 @@ stdenv.mkDerivation rec {
meta = {
inherit version;
description = ''Bitmap generation from a single example with convolutions and MCMC'';
license = stdenv.lib.licenses.mit;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.mit;
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.linux;
};
}
pkgs/tools/graphics/dcraw/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, libjpeg, lcms2, gettext, libiconv }:
{lib, stdenv, fetchurl, libjpeg, lcms2, gettext, libiconv }:
stdenv.mkDerivation rec {
name = "dcraw-9.28.0";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1fdl3xa1fbm71xzc3760rsjkvf0x5jdjrvdzyg2l9ka24vdc7418";
};
nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin libiconv;
nativeBuildInputs = lib.optional stdenv.isDarwin libiconv;
buildInputs = [ libjpeg lcms2 gettext ];
# Jasper is disabled because the library is abandoned and has many
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
meta = {
homepage = "https://www.dechifro.org/dcraw/";
description = "Decoder for many camera raw picture formats";
license = stdenv.lib.licenses.free;
platforms = stdenv.lib.platforms.unix; # Once had cygwin problems
license = lib.licenses.free;
platforms = lib.platforms.unix; # Once had cygwin problems
maintainers = [ ];
knownVulnerabilities = [
"CVE-2018-19655"
pkgs/tools/graphics/diagrams-builder/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
­~~~
*/
{ stdenv, ghcWithPackages, makeWrapper, diagrams-builder, extraPackages ? (self: []) }:
{ lib, stdenv, ghcWithPackages, makeWrapper, diagrams-builder, extraPackages ? (self: []) }:
let
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
buildInputs = [ makeWrapper ];
buildCommand = with stdenv.lib;
buildCommand = with lib;
concatStrings (intersperse "\n" (map exeWrapper backends));
# Will be faster to build the wrapper locally then to fetch it from a binary cache.
pkgs/tools/graphics/dmtx-utils/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, libdmtx, pkgconfig, imagemagick}:
{lib, stdenv, fetchurl, libdmtx, pkgconfig, imagemagick}:
let
s = # Generated upstream information
rec {
@@ -23,8 +23,8 @@ stdenv.mkDerivation {
meta = {
inherit (s) version;
description = "Data matrix command-line utilities";
license = stdenv.lib.licenses.lgpl2 ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.unix;
license = lib.licenses.lgpl2 ;
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.unix;
};
}
pkgs/tools/graphics/exiftags/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl}:
{lib, stdenv, fetchurl}:
stdenv.mkDerivation {
name = "exiftags-1.01";
@@ -19,8 +19,8 @@ stdenv.mkDerivation {
meta = {
homepage = "http://johnst.org/sw/exiftags/";
description = "Displays EXIF data from JPEG files";
license = stdenv.lib.licenses.free;
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; unix;
license = lib.licenses.free;
maintainers = with lib.maintainers; [viric];
platforms = with lib.platforms; unix;
};
}
pkgs/tools/graphics/fgallery/default.nix
+1 -1
View File
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
wrapProgram "$out/share/fgallery/fgallery" \
--set PERL5LIB "$PERL5LIB" \
--set PATH "${stdenv.lib.makeBinPath
--set PATH "${lib.makeBinPath
[ coreutils zip imagemagick pngcrush lcms2 facedetect fbida ]}"
'';
pkgs/tools/graphics/flam3/default.nix
+1 -1
View File
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "flam3";
version = "3.1.1-${stdenv.lib.strings.substring 0 7 rev}";
version = "3.1.1-${lib.strings.substring 0 7 rev}";
rev = "e0801543538451234d7a8a240ba3b417cbda5b21";
src = fetchFromGitHub {
pkgs/tools/graphics/gifsicle/default.nix
+4 -4
View File
@@ -1,9 +1,9 @@
{ stdenv, fetchurl, xorgproto, libXt, libX11
{ lib, stdenv, fetchurl, xorgproto, libXt, libX11
, gifview ? false
, static ? stdenv.hostPlatform.isStatic
}:
with stdenv.lib;
with lib;
stdenv.mkDerivation rec {
pname = "gifsicle";
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Command-line tool for creating, editing, and getting information about GIF images and animations";
homepage = "https://www.lcdf.org/gifsicle/";
license = stdenv.lib.licenses.gpl2;
license = lib.licenses.gpl2;
platforms = platforms.all;
maintainers = with stdenv.lib.maintainers; [ zimbatm ];
maintainers = with lib.maintainers; [ zimbatm ];
};
}
pkgs/tools/graphics/glee/default.nix
+1 -1
View File
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
pname = "glee";
rev = "f727ec7463d514b6279981d12833f2e11d62b33d";
version = "20170205-${stdenv.lib.strings.substring 0 7 rev}";
version = "20170205-${lib.strings.substring 0 7 rev}";
src = fetchgit {
inherit rev;
pkgs/tools/graphics/graphviz/base.nix
+5 -5
View File
@@ -7,7 +7,7 @@
assert stdenv.isDarwin -> ApplicationServices != null;
let
inherit (stdenv.lib) optional optionals optionalString;
inherit (lib) optional optionals optionalString;
raw_patch =
# https://gitlab.com/graphviz/graphviz/issues/1367 CVE-2018-10196
fetchpatch {
@@ -17,13 +17,13 @@ let
excludes = ["tests/*"]; # we don't run them and they don't apply
};
# the patch needs a small adaption for older versions
patchToUse = if stdenv.lib.versionAtLeast version "2.37" then raw_patch else
patchToUse = if lib.versionAtLeast version "2.37" then raw_patch else
stdenv.mkDerivation {
inherit (raw_patch) name;
buildCommand = "sed s/dot_root/agroot/g ${raw_patch} > $out";
};
# 2.42 has the patch included
patches = optional (stdenv.lib.versionOlder version "2.42") patchToUse;
patches = optional (lib.versionOlder version "2.42") patchToUse;
in
stdenv.mkDerivation {
@@ -46,13 +46,13 @@ stdenv.mkDerivation {
hardeningDisable = [ "fortify" ];
CPPFLAGS = stdenv.lib.optionalString (xorg != null && stdenv.isDarwin)
CPPFLAGS = lib.optionalString (xorg != null && stdenv.isDarwin)
"-I${cairo.dev}/include/cairo";
configureFlags = [
"--with-ltdl-lib=${libtool.lib}/lib"
"--with-ltdl-include=${libtool}/include"
] ++ stdenv.lib.optional (xorg == null) "--without-x";
] ++ lib.optional (xorg == null) "--without-x";
inherit patches;
pkgs/tools/graphics/guff/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub }:
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "guff";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = with stdenv.lib; {
meta = with lib; {
description = "A plot device";
homepage = "https://github.com/silentbicycle/guff";
license = licenses.isc;
pkgs/tools/graphics/icoutils/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, libpng, perl, perlPackages, makeWrapper }:
{ lib, stdenv, fetchurl, libpng, perl, perlPackages, makeWrapper }:
stdenv.mkDerivation rec {
name = "icoutils-0.32.3";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "https://www.nongnu.org/icoutils/";
description = "Set of programs to deal with Microsoft Windows(R) icon and cursor files";
license = stdenv.lib.licenses.gpl3Plus;
platforms = with stdenv.lib.platforms; linux ++ darwin;
license = lib.licenses.gpl3Plus;
platforms = with lib.platforms; linux ++ darwin;
};
}
pkgs/tools/graphics/imgur-screenshot/default.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, jq, gnugrep, libnotify, scrot, which, xclip }:
let deps = stdenv.lib.makeBinPath [ curl jq gnugrep libnotify scrot which xclip ];
let deps = lib.makeBinPath [ curl jq gnugrep libnotify scrot which xclip ];
in stdenv.mkDerivation rec {
version = "2.0.0";
pname = "imgur-screenshot";
pkgs/tools/graphics/imgurbash2/default.nix
+1 -1
View File
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin
cat <<EOF >$out/bin/imgurbash2
#!${bash}/bin/bash
PATH=${stdenv.lib.makeBinPath [curl xsel]}:\$PATH
PATH=${lib.makeBinPath [curl xsel]}:\$PATH
EOF
cat imgurbash2 >> $out/bin/imgurbash2
chmod +x $out/bin/imgurbash2
pkgs/tools/graphics/jbig2enc/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }:
{ lib, stdenv, fetchurl, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }:
stdenv.mkDerivation {
name = "jbig2enc-0.28";
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
meta = {
description = "Encoder for the JBIG2 image compression format";
license = stdenv.lib.licenses.asl20;
platforms = stdenv.lib.platforms.all;
license = lib.licenses.asl20;
platforms = lib.platforms.all;
};
}
pkgs/tools/graphics/ldgallery/compiler/default.nix
+3 -3
View File
@@ -1,7 +1,7 @@
# generated with cabal2nix by ./generate.sh
{ mkDerivation, aeson, base, cmdargs, containers, data-ordlist
, directory, fetchgit, filepath, Glob, hpack, parallel-io, process
, safe, stdenv, text, time, yaml
, safe, lib, stdenv, text, time, yaml
}:
mkDerivation {
pname = "ldgallery-compiler";
@@ -32,6 +32,6 @@ mkDerivation {
prePatch = "hpack";
homepage = "https://ldgallery.pacien.org";
description = "A static generator which turns a collection of tagged pictures into a searchable web gallery";
license = stdenv.lib.licenses.agpl3;
maintainers = with stdenv.lib.maintainers; [ pacien ];
license = lib.licenses.agpl3;
maintainers = with lib.maintainers; [ pacien ];
}
pkgs/tools/graphics/leela/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, poppler }:
{ lib, stdenv, fetchFromGitHub, pkgconfig, poppler }:
stdenv.mkDerivation {
name = "leela-12.fe7a35a";
@@ -18,8 +18,8 @@ stdenv.mkDerivation {
meta = {
description = "CLI frontend to the poppler-glib libary of PDF tools";
homepage = "https://github.com/TrilbyWhite/Leela";
license = stdenv.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.puffnfresh ];
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.puffnfresh ];
platforms = lib.platforms.linux;
};
}
pkgs/tools/graphics/lepton/default.nix
+1 -1
View File
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake git ];
buildInputs = stdenv.lib.optionals stdenv.isLinux [ glibc.static ];
buildInputs = lib.optionals stdenv.isLinux [ glibc.static ];
meta = with lib; {
homepage = "https://github.com/dropbox/lepton";
pkgs/tools/graphics/lprof/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, sconsPackages, qt3, lcms1, libtiff, vigra }:
{ lib, stdenv, fetchurl, sconsPackages, qt3, lcms1, libtiff, vigra }:
/* how to calibrate your monitor:
Eg see https://wiki.archlinux.org/index.php/ICC_Profiles#Loading_ICC_Profiles
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
meta = {
description = "Little CMS ICC profile construction set";
homepage = "https://sourceforge.net/projects/lprof";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
};
}
pkgs/tools/graphics/luxcorerender/default.nix
+4 -4
View File
@@ -41,8 +41,8 @@ in stdenv.mkDerivation {
gsettings-desktop-schemas glib gtk3
# needed for XDG_ICON_DIRS
gnome3.adwaita-icon-theme
(stdenv.lib.getLib dconf)
] ++ stdenv.lib.optionals withOpenCL [ opencl-headers ocl-icd opencl-clhpp rocm-opencl-runtime ];
(lib.getLib dconf)
] ++ lib.optionals withOpenCL [ opencl-headers ocl-icd opencl-clhpp rocm-opencl-runtime ];
cmakeFlags = [
"-DOpenEXR_Iex_INCLUDE_DIR=${openexr.dev}/include/OpenEXR"
@@ -54,7 +54,7 @@ in stdenv.mkDerivation {
"-DEMBREE_INCLUDE_PATH=${embree2}/include"
"-DEMBREE_LIBRARY=${embree2}/lib/libembree.so"
"-DBoost_PYTHON_LIBRARY_RELEASE=${boost_static}/lib/libboost_python3-mt.so"
] ++ stdenv.lib.optional withOpenCL
] ++ lib.optional withOpenCL
"-DOPENCL_INCLUDE_DIR=${opencl-headers}/include";
preConfigure = ''
@@ -73,7 +73,7 @@ in stdenv.mkDerivation {
wrapProgram "$out/bin/luxcoreui" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
--suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share' \
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules"
--prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules"
'';
meta = with lib; {
pkgs/tools/graphics/maim/default.nix
+2 -2
View File
@@ -30,8 +30,8 @@ stdenv.mkDerivation rec {
supposed to be an improved scrot.
'';
changelog = "https://github.com/naelstrof/maim/releases/tag/v${version}";
platforms = stdenv.lib.platforms.all;
license = stdenv.lib.licenses.gpl3Plus;
platforms = lib.platforms.all;
license = lib.licenses.gpl3Plus;
maintainers = with maintainers; [ primeos mbakke ];
};
}
pkgs/tools/graphics/mscgen/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv
{ lib, stdenv
, bison
, fetchurl
, flex
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
meta = {
homepage = "http://www.mcternan.me.uk/mscgen/";
description = "Convert Message Sequence Chart descriptions into PNG, SVG, or EPS images";
license = stdenv.lib.licenses.gpl2;
license = lib.licenses.gpl2;
longDescription = ''
Mscgen is a small program that parses Message Sequence Chart
@@ -51,7 +51,7 @@ stdenv.mkDerivation {
printing.
'';
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.peti ];
platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.peti ];
};
}
pkgs/tools/graphics/netpbm/default.nix
+5 -5
View File
@@ -51,7 +51,7 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
# Environment variables
STRIPPROG = "${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip";
STRIPPROG = "${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip";
postPatch = ''
# Install libnetpbm.so symlink to correct destination
@@ -68,12 +68,12 @@ stdenv.mkDerivation {
echo "STATICLIB_TOO = N" >> config.mk
# Enable cross-compilation
echo 'AR = ${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar' >> config.mk
echo 'AR = ${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar' >> config.mk
echo 'CC = ${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc' >> config.mk
echo 'CC_FOR_BUILD = ${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc' >> config.mk
echo 'LD_FOR_BUILD = $(CC_FOR_BUILD)' >> config.mk
echo 'PKG_CONFIG = ${buildPackages.pkgconfig}/bin/${buildPackages.pkgconfig.targetPrefix}pkg-config' >> config.mk
echo 'RANLIB = ${stdenv.lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib' >> config.mk
echo 'RANLIB = ${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib' >> config.mk
# Use libraries from Nixpkgs
echo "TIFFLIB = libtiff.so" >> config.mk
@@ -86,7 +86,7 @@ stdenv.mkDerivation {
# Fix path to rgb.txt
echo "RGB_DB_PATH = $out/share/netpbm/misc/rgb.txt" >> config.mk
'' + stdenv.lib.optionalString stdenv.isDarwin ''
'' + lib.optionalString stdenv.isDarwin ''
echo "LDSHLIB=-dynamiclib -install_name $out/lib/libnetpbm.\$(MAJ).dylib" >> config.mk
echo "NETPBMLIBTYPE = dylib" >> config.mk
echo "NETPBMLIBSUFFIX = dylib" >> config.mk
@@ -120,6 +120,6 @@ stdenv.mkDerivation {
homepage = "http://netpbm.sourceforge.net/";
description = "Toolkit for manipulation of graphic images";
license = lib.licenses.free; # http://netpbm.svn.code.sourceforge.net/p/netpbm/code/trunk/doc/copyright_summary
platforms = with stdenv.lib.platforms; linux ++ darwin;
platforms = with lib.platforms; linux ++ darwin;
};
}
pkgs/tools/graphics/nifskope/default.nix
+1 -1
View File
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
url = "https://github.com/niftools/nifskope/commit/30954e7f01f3d779a2a1fd37d363e8a6ad560bd3.patch";
sha256 = "0d6xjj2mjjhdd7w1aig5f75jksjni16jyj0lxsz51pys6xqb6fpj";
})
] ++ (stdenv.lib.optional stdenv.isAarch64 ./no-sse-on-arm.patch);
] ++ (lib.optional stdenv.isAarch64 ./no-sse-on-arm.patch);
buildInputs = [ qtbase qttools libGLU.dev ];
nativeBuildInputs = [ qmake wrapQtAppsHook ];
pkgs/tools/graphics/optar/default.nix
+1 -1
View File
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
--replace /usr/local $out
substituteInPlace pgm2ps \
--replace 'convert ' "${stdenv.lib.getBin imagemagick}/bin/convert "
--replace 'convert ' "${lib.getBin imagemagick}/bin/convert "
'';
preInstall = ''
pkgs/tools/graphics/optipng/default.nix
+2 -2
View File
@@ -4,7 +4,7 @@
# This package comes with its own copy of zlib, libpng and pngxtern
with stdenv.lib;
with lib;
stdenv.mkDerivation rec {
name = "optipng-0.7.7";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--with-system-zlib"
"--with-system-libpng"
] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
#"-prefix=$out"
];
pkgs/tools/graphics/pdfread/default.nix
+1 -1
View File
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
cp -R *.py pylrs $PYDIR
wrapProgram $out/bin/pdfread.py --prefix PYTHONPATH : $PYTHONPATH:${pillow}/$LIBSUFFIX/PIL:$PYDIR \
--prefix PATH : ${stdenv.lib.makeBinPath [ ghostscript pngnq djvulibre unrar optipng ]}
--prefix PATH : ${lib.makeBinPath [ ghostscript pngnq djvulibre unrar optipng ]}
'';
meta = with lib; {
pkgs/tools/graphics/pfstools/default.nix
+3 -3
View File
@@ -18,9 +18,9 @@ mkDerivation rec {
preConfigure = ''
rm cmake/FindNETPBM.cmake
echo "SET(NETPBM_LIBRARY `find ${stdenv.lib.getLib netpbm} -name "*.${stdenv.hostPlatform.extensions.sharedLibrary}*" -type f`)" >> cmake/FindNETPBM.cmake
echo "SET(NETPBM_LIBRARIES `find ${stdenv.lib.getLib netpbm} -name "*.${stdenv.hostPlatform.extensions.sharedLibrary}*" -type f`)" >> cmake/FindNETPBM.cmake
echo "SET(NETPBM_INCLUDE_DIR ${stdenv.lib.getDev netpbm}/include/netpbm)" >> cmake/FindNETPBM.cmake
echo "SET(NETPBM_LIBRARY `find ${lib.getLib netpbm} -name "*.${stdenv.hostPlatform.extensions.sharedLibrary}*" -type f`)" >> cmake/FindNETPBM.cmake
echo "SET(NETPBM_LIBRARIES `find ${lib.getLib netpbm} -name "*.${stdenv.hostPlatform.extensions.sharedLibrary}*" -type f`)" >> cmake/FindNETPBM.cmake
echo "SET(NETPBM_INCLUDE_DIR ${lib.getDev netpbm}/include/netpbm)" >> cmake/FindNETPBM.cmake
echo "INCLUDE(FindPackageHandleStandardArgs)" >> cmake/FindNETPBM.cmake
echo "FIND_PACKAGE_HANDLE_STANDARD_ARGS(NETPBM DEFAULT_MSG NETPBM_LIBRARY NETPBM_INCLUDE_DIR)" >> cmake/FindNETPBM.cmake
'';
pkgs/tools/graphics/pgf/default.nix
+4 -4
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, autoconf, automake, libtool, dos2unix, libpgf, freeimage, doxygen }:
{ lib, stdenv, fetchurl, autoconf, automake, libtool, dos2unix, libpgf, freeimage, doxygen }:
with stdenv.lib;
with lib;
let
version = "6.14.12";
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
meta = {
homepage = "https://www.libpgf.org/";
description = "Progressive Graphics Format command line program";
license = stdenv.lib.licenses.lgpl21Plus;
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.lgpl21Plus;
platforms = lib.platforms.linux;
};
}
pkgs/tools/graphics/piglit/default.nix
+1 -1
View File
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/piglit \
--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libGL libglvnd ]} \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL libglvnd ]} \
--prefix PATH : "${waffle}/bin"
'';
pkgs/tools/graphics/plotutils/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ fetchurl, stdenv, libpng, autoreconfHook }:
{ fetchurl, lib, stdenv, libpng, autoreconfHook }:
# debian splits this package into plotutils and libplot2c2
@@ -51,8 +51,8 @@ stdenv.mkDerivation rec {
homepage = "https://www.gnu.org/software/plotutils/";
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.marcweber ];
platforms = stdenv.lib.platforms.unix;
license = lib.licenses.gpl2Plus;
maintainers = [ lib.maintainers.marcweber ];
platforms = lib.platforms.unix;
};
}
pkgs/tools/graphics/pngcheck/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, zlib }:
{ lib, stdenv, fetchurl, zlib }:
stdenv.mkDerivation rec {
name = "pngcheck-2.3.0";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://pmt.sourceforge.net/pngcrush";
description = "Verifies the integrity of PNG, JNG and MNG files";
license = stdenv.lib.licenses.free;
platforms = with stdenv.lib.platforms; linux;
license = lib.licenses.free;
platforms = with lib.platforms; linux;
};
}
pkgs/tools/graphics/pngcrush/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, libpng }:
{ lib, stdenv, fetchurl, libpng }:
stdenv.mkDerivation rec {
name = "pngcrush-1.8.13";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://pmt.sourceforge.net/pngcrush";
description = "A PNG optimizer";
license = stdenv.lib.licenses.free;
platforms = with stdenv.lib.platforms; linux ++ darwin;
license = lib.licenses.free;
platforms = with lib.platforms; linux ++ darwin;
};
}
pkgs/tools/graphics/pngout/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl}:
{lib, stdenv, fetchurl}:
let
folder = if stdenv.hostPlatform.system == "i686-linux" then "i686"
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
installPhase = ''
mkdir -p $out/bin
cp ${folder}/pngout $out/bin
${if stdenv.hostPlatform.system == "i686-linux" then ''
patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/bin/pngout
'' else if stdenv.hostPlatform.system == "x86_64-linux" then ''
@@ -26,8 +26,8 @@ stdenv.mkDerivation {
meta = {
description = "A tool that aggressively optimizes the sizes of PNG images";
license = stdenv.lib.licenses.unfree;
license = lib.licenses.unfree;
homepage = "http://advsys.net/ken/utils.htm";
maintainers = [ stdenv.lib.maintainers.sander ];
maintainers = [ lib.maintainers.sander ];
};
}
pkgs/tools/graphics/pngtoico/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, libpng }:
{ lib, stdenv, fetchurl, libpng }:
stdenv.mkDerivation {
name = "pngtoico-1.0";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
meta = {
homepage = "https://www.kernel.org/pub/software/graphics/pngtoico/";
description = "Small utility to convert a set of PNG images to Microsoft ICO format";
license = stdenv.lib.licenses.gpl2Plus;
platforms = with stdenv.lib.platforms; linux;
license = lib.licenses.gpl2Plus;
platforms = with lib.platforms; linux;
};
}
pkgs/tools/graphics/quirc/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{stdenv, fetchgit, SDL_gfx, SDL, libjpeg, libpng, pkgconfig}:
{lib, stdenv, fetchgit, SDL_gfx, SDL, libjpeg, libpng, pkgconfig}:
let
s =
rec {
@@ -32,8 +32,8 @@ stdenv.mkDerivation {
meta = {
inherit (s) version;
description = ''A small QR code decoding library'';
license = stdenv.lib.licenses.isc;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.isc;
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.linux;
};
}
pkgs/tools/graphics/s2png/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, diffutils, gd, pkgconfig }:
{ lib, stdenv, fetchFromGitHub, diffutils, gd, pkgconfig }:
stdenv.mkDerivation rec {
pname = "s2png";
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
meta = {
homepage = "https://github.com/dbohdan/s2png/";
description = "Store any data in PNG images";
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.dbohdan ];
platforms = stdenv.lib.platforms.unix;
license = lib.licenses.gpl2;
maintainers = [ lib.maintainers.dbohdan ];
platforms = lib.platforms.unix;
};
}
pkgs/tools/graphics/syntex/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{stdenv, fetchFromGitHub, mono}:
{lib, stdenv, fetchFromGitHub, mono}:
stdenv.mkDerivation rec {
pname = "syntex";
version = "0.0pre20160915";
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
meta = {
inherit version;
description = ''Texture synthesis from examples'';
license = stdenv.lib.licenses.mit;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.mit;
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.linux;
};
}
pkgs/tools/graphics/transfig/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, zlib, libjpeg, libpng, imake, gccmakedep }:
{ lib, stdenv, fetchurl, zlib, libjpeg, libpng, imake, gccmakedep }:
stdenv.mkDerivation {
name = "transfig-3.2.4";
@@ -56,6 +56,6 @@ stdenv.mkDerivation {
hardeningDisable = [ "format" ];
meta = {
platforms = stdenv.lib.platforms.unix;
platforms = lib.platforms.unix;
};
}
pkgs/tools/graphics/vips/default.nix
+1 -1
View File
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
python27
libpng
expat
] ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices;
] ++ lib.optional stdenv.isDarwin ApplicationServices;
# Required by .pc file
propagatedBuildInputs = [
pkgs/tools/graphics/waifu2x-converter-cpp/default.nix
+5 -5
View File
@@ -1,4 +1,4 @@
{ cmake, fetchFromGitHub, makeWrapper, opencv3, stdenv, ocl-icd, opencl-headers
{ cmake, fetchFromGitHub, makeWrapper, opencv3, lib, stdenv, ocl-icd, opencl-headers
, cudaSupport ? false, cudatoolkit ? null
}:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
buildInputs = [
ocl-icd opencv3 opencl-headers
] ++ stdenv.lib.optional cudaSupport cudatoolkit;
] ++ lib.optional cudaSupport cudatoolkit;
nativeBuildInputs = [ cmake makeWrapper ];
@@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Improved fork of Waifu2X C++ using OpenCL and OpenCV";
homepage = "https://github.com/DeadSix27/waifu2x-converter-cpp";
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.xzfc ];
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.mit;
maintainers = [ lib.maintainers.xzfc ];
platforms = lib.platforms.linux;
};
}
pkgs/tools/graphics/wavefunctioncollapse/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{stdenv, fetchFromGitHub, mono}:
{lib, stdenv, fetchFromGitHub, mono}:
stdenv.mkDerivation rec {
pname = "wavefunctioncollapse";
version = "0.0pre20170130";
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
meta = {
inherit version;
description = ''A generator of bitmaps that are locally similar to the input bitmap'';
license = stdenv.lib.licenses.mit;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.mit;
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.linux;
};
}
pkgs/tools/graphics/welkin/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchsvn, jre, makeWrapper }:
{ lib, stdenv, fetchsvn, jre, makeWrapper }:
stdenv.mkDerivation rec {
pname = "welkin";
@@ -26,11 +26,11 @@ stdenv.mkDerivation rec {
meta = {
description = "An RDF visualizer";
maintainers = with stdenv.lib.maintainers; [
maintainers = with lib.maintainers; [
raskin
];
hydraPlatforms = [];
license = stdenv.lib.licenses.free;
platforms = with stdenv.lib.platforms; unix;
license = lib.licenses.free;
platforms = with lib.platforms; unix;
};
}
pkgs/tools/graphics/xcftools/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, libpng, perl, gettext }:
{lib, stdenv, fetchurl, libpng, perl, gettext }:
stdenv.mkDerivation {
name = "xcftools-1.0.7";
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
These tools work independently of the Gimp engine and do not
require the Gimp to even be installed.
'';
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
};
}
pkgs/tools/graphics/yafaray-core/default.nix
+1 -1
View File
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
buildInputs = [
boost165 opencv zlib libxml2 freetype libjpeg libtiff
swig openexr ilmbase
] ++ stdenv.lib.optional withPython python3;
] ++ lib.optional withPython python3;
meta = with lib; {
description = "A free, open source raytracer";
pkgs/tools/graphics/yaxg/default.nix
+1 -1
View File
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin/
mv yaxg $out/bin/
chmod +x $out/bin/yaxg
wrapProgram $out/bin/yaxg --prefix PATH : ${ stdenv.lib.makeBinPath [ maim slop ffmpeg_3 byzanz libnotify xdpyinfo ]}
wrapProgram $out/bin/yaxg --prefix PATH : ${ lib.makeBinPath [ maim slop ffmpeg_3 byzanz libnotify xdpyinfo ]}
'';
meta = with lib; {
pkgs/tools/graphics/zxing/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, jre }:
{ lib, stdenv, fetchurl, jre }:
stdenv.mkDerivation rec {
pname = "zxing";
version = "3.1.0";
@@ -26,9 +26,9 @@ stdenv.mkDerivation rec {
meta = {
inherit version;
description = ''1D and 2D code reading library'';
license = stdenv.lib.licenses.asl20;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.asl20;
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.linux;
homepage = "https://github.com/zxing/zxing";
};
}