pkgs/applications: stdenv.lib -> lib

This commit is contained in:
Ben Siraphob 2021-01-15 12:42:41 +07:00
parent 2e34288f0d
commit 108bdac3d9
427 changed files with 1160 additions and 1154 deletions

View file

@ -1,4 +1,4 @@
{ stdenv { lib, stdenv
, fetchFromGitHub , fetchFromGitHub
, nix-update-script , nix-update-script
, substituteAll , substituteAll
@ -31,7 +31,7 @@
, yelp-tools , yelp-tools
}: }:
with stdenv.lib; with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "lightdm"; pname = "lightdm";

View file

@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
"--sysconfdir=/etc" "--sysconfdir=/etc"
"--disable-indicator-services-command" "--disable-indicator-services-command"
"--sbindir=${placeholder "out"}/bin" # for wrapGAppsHook to wrap automatically "--sbindir=${placeholder "out"}/bin" # for wrapGAppsHook to wrap automatically
] ++ stdenv.lib.optional useGTK2 "--with-gtk2"; ] ++ lib.optional useGTK2 "--with-gtk2";
preConfigure = '' preConfigure = ''
configureFlagsArray+=( --enable-at-spi-command="${at-spi2-core}/libexec/at-spi-bus-launcher --launch-immediately" ) configureFlagsArray+=( --enable-at-spi-command="${at-spi2-core}/libexec/at-spi-bus-launcher --launch-immediately" )

View file

@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
sha256 = "0pycia75vdfh6gxfd2hr32cxrryfxydid804n0v76l2fpr9v9v3d"; sha256 = "0pycia75vdfh6gxfd2hr32cxrryfxydid804n0v76l2fpr9v9v3d";
}; };
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ xar cpio ]; buildInputs = lib.optionals stdenv.isDarwin [ xar cpio ];
unpackPhase = stdenv.lib.optionalString stdenv.isDarwin '' unpackPhase = lib.optionalString stdenv.isDarwin ''
xar -xf $src xar -xf $src
zcat Payload | cpio -i zcat Payload | cpio -i
''; '';
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
dontStrip = stdenv.isDarwin; dontStrip = stdenv.isDarwin;
nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ autoPatchelfHook ]; nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ];
doInstallCheck = true; doInstallCheck = true;

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, ncurses, readline, autoreconfHook }: { lib, stdenv, fetchurl, fetchpatch, pkgconfig, ncurses, readline, autoreconfHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "abook-0.6.1"; name = "abook-0.6.1";
@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = "http://abook.sourceforge.net/"; homepage = "http://abook.sourceforge.net/";
description = "Text-based addressbook program designed to use with mutt mail client"; description = "Text-based addressbook program designed to use with mutt mail client";
license = stdenv.lib.licenses.gpl2; license = lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.edwtjo ]; maintainers = [ lib.maintainers.edwtjo ];
platforms = with stdenv.lib.platforms; linux; platforms = with lib.platforms; linux;
}; };
} }

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libX11, cups, zlib, libxml2, pango, atk, gtk2, glib { lib, stdenv, fetchurl, libX11, cups, zlib, libxml2, pango, atk, gtk2, glib
, gdk-pixbuf, gdk-pixbuf-xlib }: , gdk-pixbuf, gdk-pixbuf-xlib }:
assert stdenv.hostPlatform.system == "i686-linux"; assert stdenv.hostPlatform.system == "i686-linux";
@ -19,7 +19,7 @@ stdenv.mkDerivation {
# We should probably remove those and use the regular Nixpkgs # We should probably remove those and use the regular Nixpkgs
# versions. # versions.
libPath = stdenv.lib.makeLibraryPath libPath = lib.makeLibraryPath
[ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk2 glib gdk-pixbuf gdk-pixbuf-xlib ]; [ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk2 glib gdk-pixbuf gdk-pixbuf-xlib ];
passthru.mozillaPlugin = "/libexec/adobe-reader/Browser/intellinux"; passthru.mozillaPlugin = "/libexec/adobe-reader/Browser/intellinux";
@ -27,7 +27,7 @@ stdenv.mkDerivation {
meta = { meta = {
description = "Adobe Reader, a viewer for PDF documents"; description = "Adobe Reader, a viewer for PDF documents";
homepage = "http://www.adobe.com/products/reader"; homepage = "http://www.adobe.com/products/reader";
license = stdenv.lib.licenses.unfree; license = lib.licenses.unfree;
knownVulnerabilities = [ knownVulnerabilities = [
"Numerous unresolved vulnerabilities" "Numerous unresolved vulnerabilities"
"See: https://www.cvedetails.com/product/497/Adobe-Acrobat-Reader.html?vendor_id=53" "See: https://www.cvedetails.com/product/497/Adobe-Acrobat-Reader.html?vendor_id=53"

View file

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
version = "0.12.2"; version = "0.12.2";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "IWYOnOu0C9uQ9k1dgWkJ6Kv+o/jY+6Llfsi4PusHE24="; sha256 = "IWYOnOu0C9uQ9k1dgWkJ6Kv+o/jY+6Llfsi4PusHE24=";
}; };

View file

@ -1,8 +1,8 @@
{ stdenv, attemptoClex, callPackage }: { lib, stdenv, attemptoClex, callPackage }:
callPackage ./. { callPackage ./. {
pname = "ape-clex"; pname = "ape-clex";
lexiconPath = "${attemptoClex}/clex_lexicon.pl"; lexiconPath = "${attemptoClex}/clex_lexicon.pl";
description = "Parser for Attempto Controlled English (ACE) with a large lexicon (~100,000 entries)"; description = "Parser for Attempto Controlled English (ACE) with a large lexicon (~100,000 entries)";
license = with stdenv.lib; [ licenses.lgpl3 licenses.gpl3 ]; license = with lib; [ licenses.lgpl3 licenses.gpl3 ];
} }

View file

@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
cp ../Startup.pdf $out/share/doc/apvlv/Startup.pdf cp ../Startup.pdf $out/share/doc/apvlv/Startup.pdf
cp ../main_menubar.glade $out/share/doc/apvlv/main_menubar.glade cp ../main_menubar.glade $out/share/doc/apvlv/main_menubar.glade
'' ''
+ stdenv.lib.optionalString (!stdenv.isDarwin) '' + lib.optionalString (!stdenv.isDarwin) ''
install -D ../apvlv.desktop $out/share/applications/apvlv.desktop install -D ../apvlv.desktop $out/share/applications/apvlv.desktop
''; '';

View file

@ -14,7 +14,7 @@
, enableLibpulseaudio ? true, libpulseaudio ? null , enableLibpulseaudio ? true, libpulseaudio ? null
}: }:
with stdenv.lib; with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "sox-14.4.2"; name = "sox-14.4.2";

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake }: { lib, stdenv, fetchurl, cmake }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "soxr-0.1.3"; name = "soxr-0.1.3";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "An audio resampling library"; description = "An audio resampling library";
homepage = "http://soxr.sourceforge.net"; homepage = "http://soxr.sourceforge.net";
license = stdenv.lib.licenses.lgpl21Plus; license = lib.licenses.lgpl21Plus;
platforms = stdenv.lib.platforms.unix; platforms = lib.platforms.unix;
}; };
} }

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, snack, tcl, tk, makeWrapper }: { lib, stdenv, fetchurl, snack, tcl, tk, makeWrapper }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "wavesurfer-1.8.5"; name = "wavesurfer-1.8.5";
@ -17,12 +17,12 @@ stdenv.mkDerivation {
ln -s $out/{nix-support,bin}/wavesurfer.tcl ln -s $out/{nix-support,bin}/wavesurfer.tcl
wrapProgram "$out/nix-support/wavesurfer.tcl" \ wrapProgram "$out/nix-support/wavesurfer.tcl" \
--set TCLLIBPATH "${snack}/lib" \ --set TCLLIBPATH "${snack}/lib" \
--prefix PATH : "${stdenv.lib.makeBinPath [ tcl tk ]}" --prefix PATH : "${lib.makeBinPath [ tcl tk ]}"
''; '';
meta = { meta = {
description = "Tool for recording, playing, editing, viewing and labeling of audio"; description = "Tool for recording, playing, editing, viewing and labeling of audio";
homepage = "http://www.speech.kth.se/wavesurfer/"; homepage = "http://www.speech.kth.se/wavesurfer/";
license = stdenv.lib.licenses.bsd0; license = lib.licenses.bsd0;
}; };
} }

View file

@ -20,10 +20,10 @@ stdenv.mkDerivation {
cat >> "$out/bin/avrdudess" << __EOF__ cat >> "$out/bin/avrdudess" << __EOF__
#!${runtimeShell} #!${runtimeShell}
export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [gtk2 mono]}" export LD_LIBRARY_PATH="${lib.makeLibraryPath [gtk2 mono]}"
# We need PATH from user env for xdg-open to find its tools, which # We need PATH from user env for xdg-open to find its tools, which
# typically depend on the currently running desktop environment. # typically depend on the currently running desktop environment.
export PATH="${stdenv.lib.makeBinPath [ avrdude xdg_utils ]}:\$PATH" export PATH="${lib.makeBinPath [ avrdude xdg_utils ]}:\$PATH"
# avrdudess must have its resource files in its current working directory # avrdudess must have its resource files in its current working directory
cd $out/avrdudess && exec ${mono}/bin/mono "$out/avrdudess/avrdudess.exe" "\$@" cd $out/avrdudess && exec ${mono}/bin/mono "$out/avrdudess/avrdudess.exe" "\$@"

View file

@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
${gnutar}/bin/tar xf $src --strip 1 -C ${targetPath} ${gnutar}/bin/tar xf $src --strip 1 -C ${targetPath}
''; '';
sqltoolsserviceRpath = stdenv.lib.makeLibraryPath [ sqltoolsserviceRpath = lib.makeLibraryPath [
stdenv.cc.cc stdenv.cc.cc
libunwind libunwind
libuuid libuuid
@ -62,10 +62,10 @@ stdenv.mkDerivation rec {
# this will most likely need to be updated when azuredatastudio's version changes # this will most likely need to be updated when azuredatastudio's version changes
sqltoolsservicePath = "${targetPath}/resources/app/extensions/mssql/sqltoolsservice/Linux/2.0.0-release.56"; sqltoolsservicePath = "${targetPath}/resources/app/extensions/mssql/sqltoolsservice/Linux/2.0.0-release.56";
rpath = stdenv.lib.concatStringsSep ":" [ rpath = lib.concatStringsSep ":" [
atomEnv.libPath atomEnv.libPath
( (
stdenv.lib.makeLibraryPath [ lib.makeLibraryPath [
libuuid libuuid
at-spi2-core at-spi2-core
at-spi2-atk at-spi2-atk
@ -107,7 +107,7 @@ stdenv.mkDerivation rec {
''; '';
meta = { meta = {
maintainers = with stdenv.lib.maintainers; [ xavierzwirtz ]; maintainers = with lib.maintainers; [ xavierzwirtz ];
description = "A data management tool that enables working with SQL Server, Azure SQL DB and SQL DW"; description = "A data management tool that enables working with SQL Server, Azure SQL DB and SQL DW";
homepage = "https://docs.microsoft.com/en-us/sql/azure-data-studio/download-azure-data-studio"; homepage = "https://docs.microsoft.com/en-us/sql/azure-data-studio/download-azure-data-studio";
license = lib.licenses.unfreeRedistributable; license = lib.licenses.unfreeRedistributable;

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, curl, xorg, avahi, qtbase, mkDerivation, { lib, stdenv, fetchFromGitHub, cmake, curl, xorg, avahi, qtbase, mkDerivation,
openssl, wrapGAppsHook, openssl, wrapGAppsHook,
avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; } avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; }
}: }:
@ -23,7 +23,7 @@ mkDerivation rec {
''; '';
qtWrapperArgs = [ qtWrapperArgs = [
''--prefix PATH : ${stdenv.lib.makeBinPath [ openssl ]}'' ''--prefix PATH : ${lib.makeBinPath [ openssl ]}''
]; ];
meta = { meta = {
@ -35,8 +35,8 @@ mkDerivation rec {
''; '';
homepage = "https://github.com/debauchee/barrier"; homepage = "https://github.com/debauchee/barrier";
downloadPage = "https://github.com/debauchee/barrier/releases"; downloadPage = "https://github.com/debauchee/barrier/releases";
license = stdenv.lib.licenses.gpl2; license = lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.phryneas ]; maintainers = [ lib.maintainers.phryneas ];
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
}; };
} }

View file

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
++ lib.optional waylandSupport "wayland" ++ lib.optional waylandSupport "wayland"
++ lib.optional x11Support "x11"; ++ lib.optional x11Support "x11";
buildInputs = with stdenv.lib; [ buildInputs = with lib; [
cairo cairo
fribidi fribidi
harfbuzz harfbuzz

View file

@ -1,4 +1,4 @@
{ mkDerivation, stdenv, fetchurl, cmake, pkgconfig, sword, boost, clucene_core { lib, mkDerivation, stdenv, fetchurl, cmake, pkgconfig, sword, boost, clucene_core
, qtbase, qttools, qtsvg, qtwebkit , qtbase, qttools, qtsvg, qtwebkit
}: }:
@ -29,8 +29,8 @@ mkDerivation rec {
meta = { meta = {
description = "A Qt4 Bible study tool"; description = "A Qt4 Bible study tool";
homepage = "http://www.bibletime.info/"; homepage = "http://www.bibletime.info/";
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
license = stdenv.lib.licenses.gpl2; license = lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.piotr ]; maintainers = [ lib.maintainers.piotr ];
}; };
} }

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, fftw, ncurses5, libpulseaudio, makeWrapper }: { lib, stdenv, fetchFromGitHub, cmake, fftw, ncurses5, libpulseaudio, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.8"; version = "1.8";
@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = "https://github.com/dpayne/cli-visualizer"; homepage = "https://github.com/dpayne/cli-visualizer";
description = "CLI based audio visualizer"; description = "CLI based audio visualizer";
license = stdenv.lib.licenses.mit; license = lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; maintainers = [ lib.maintainers.matthiasbeyer ];
platforms = with stdenv.lib.platforms; linux; platforms = with lib.platforms; linux;
}; };
} }

View file

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gtk3 libayatana-appindicator ]; buildInputs = [ gtk3 libayatana-appindicator ];
gappsWrapperArgs = [ gappsWrapperArgs = [
"--prefix" "PATH" ":" "${stdenv.lib.makeBinPath [ xdotool which ]}" "--prefix" "PATH" ":" "${lib.makeBinPath [ xdotool which ]}"
]; ];
meta = with lib; { meta = with lib; {

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, qt4, qmake4Hook }: { lib, stdenv, fetchurl, qt4, qmake4Hook }:
let version = "0.6.4"; in let version = "0.6.4"; in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -22,8 +22,8 @@ stdenv.mkDerivation {
meta = { meta = {
description = "Offline conference schedule viewer"; description = "Offline conference schedule viewer";
homepage = "http://www.toastfreeware.priv.at/confclerk"; homepage = "http://www.toastfreeware.priv.at/confclerk";
license = stdenv.lib.licenses.gpl2; license = lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ ehmry ]; maintainers = with lib.maintainers; [ ehmry ];
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
}; };
} }

View file

@ -51,7 +51,7 @@ stdenv.mkDerivation rec{
]; ];
runtimeDeps = [ mesa-demos vulkan-tools ]; runtimeDeps = [ mesa-demos vulkan-tools ];
binPath = stdenv.lib.makeBinPath runtimeDeps; binPath = lib.makeBinPath runtimeDeps;
dontWrapQtApps = true; dontWrapQtApps = true;

View file

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
wrapProgram $out/bin/cpu-x \ wrapProgram $out/bin/cpu-x \
--prefix PATH : ${stdenv.lib.makeBinPath [ stdenv.cc ]} --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]}
''; '';
meta = with lib; { meta = with lib; {

View file

@ -1,4 +1,5 @@
{ stdenv { lib
, stdenv
, mkDerivation , mkDerivation
, fetchFromGitHub , fetchFromGitHub
, substituteAll , substituteAll
@ -64,7 +65,7 @@ mkDerivation rec {
buildInputs = [ leptonica tesseract4 qtmultimedia qtx11extras ]; buildInputs = [ leptonica tesseract4 qtmultimedia qtx11extras ];
meta = with stdenv.lib; { meta = with lib; {
description = "A simple and lightweight translator that allows to translate and speak text using Google, Yandex and Bing"; description = "A simple and lightweight translator that allows to translate and speak text using Google, Yandex and Bing";
homepage = "https://crow-translate.github.io/"; homepage = "https://crow-translate.github.io/";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub }: { lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "crumbs"; pname = "crumbs";
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
cp crumbs-completion.fish $out/share/fish/vendor_completions.d/crumbs.fish cp crumbs-completion.fish $out/share/fish/vendor_completions.d/crumbs.fish
''; '';
meta = with stdenv.lib; meta = with lib;
{ description = "Bookmarks for the command line"; { description = "Bookmarks for the command line";
homepage = "https://github.com/fasseg/crumbs"; homepage = "https://github.com/fasseg/crumbs";
license = licenses.wtfpl; license = licenses.wtfpl;

View file

@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
makeWrapper $out/dbeaver/dbeaver $out/bin/dbeaver \ makeWrapper $out/dbeaver/dbeaver $out/bin/dbeaver \
--prefix PATH : ${jdk}/bin \ --prefix PATH : ${jdk}/bin \
--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk3 libXtst ])} \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst ])} \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
# Create desktop item. # Create desktop item.

View file

@ -1,4 +1,4 @@
{ stdenv, mkDerivation, fetchFromGitHub, cmake, file, qtbase, qttools, solid }: { lib, stdenv, mkDerivation, fetchFromGitHub, cmake, file, qtbase, qttools, solid }:
mkDerivation { mkDerivation {
pname = "dfilemanager"; pname = "dfilemanager";
@ -19,7 +19,7 @@ mkDerivation {
meta = { meta = {
homepage = "http://dfilemanager.sourceforge.net/"; homepage = "http://dfilemanager.sourceforge.net/";
description = "File manager written in Qt/C++"; description = "File manager written in Qt/C++";
license = stdenv.lib.licenses.gpl2; license = lib.licenses.gpl2;
platforms = stdenv.lib.platforms.unix; platforms = lib.platforms.unix;
}; };
} }

View file

@ -1,4 +1,4 @@
{ stdenv, mkDerivation, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler }: { lib, stdenv, mkDerivation, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler }:
mkDerivation rec { mkDerivation rec {
version = "2.1.3"; version = "2.1.3";
@ -51,9 +51,9 @@ mkDerivation rec {
meta = { meta = {
homepage = "http://www.qtrac.eu/diffpdfc.html"; homepage = "http://www.qtrac.eu/diffpdfc.html";
description = "Tool for diffing pdf files visually or textually"; description = "Tool for diffing pdf files visually or textually";
license = stdenv.lib.licenses.gpl2Plus; license = lib.licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [ tstrobel ]; maintainers = with lib.maintainers; [ tstrobel ];
platforms = with stdenv.lib.platforms; linux; platforms = with lib.platforms; linux;
inherit version; inherit version;
}; };
} }

View file

@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
cp -v ding.png $out/share/pixmaps/ cp -v ding.png $out/share/pixmaps/
cp -v ding.desktop $out/share/applications/ cp -v ding.desktop $out/share/applications/
wrapProgram $out/bin/ding --prefix PATH : ${stdenv.lib.makeBinPath [ gnugrep aspellEnv tk fortune ]} --prefix ASPELL_CONF : "\"prefix ${aspellEnv};\"" wrapProgram $out/bin/ding --prefix PATH : ${lib.makeBinPath [ gnugrep aspellEnv tk fortune ]} --prefix ASPELL_CONF : "\"prefix ${aspellEnv};\""
''; '';
meta = with lib; { meta = with lib; {

View file

@ -16,7 +16,7 @@ mkDerivation {
nativeBuildInputs = [ cmake qttools pkgconfig xxd ]; nativeBuildInputs = [ cmake qttools pkgconfig xxd ];
buildInputs = [ qtbase qtmultimedia zlib bzip2 ]; buildInputs = [ qtbase qtmultimedia zlib bzip2 ];
hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format"; hardeningDisable = lib.optional stdenv.isDarwin "format";
meta = with lib; { meta = with lib; {
homepage = "http://doomseeker.drdteam.org/"; homepage = "http://doomseeker.drdteam.org/";

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, ncurses, hdate, lua5_2 }: { lib, stdenv, fetchFromGitHub, ncurses, hdate, lua5_2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "12010904"; version = "12010904";
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
Defaults to dozenal Roman numerals. Defaults to dozenal Roman numerals.
''; '';
homepage = "https://github.com/dgoodmaniii/dozenal/"; homepage = "https://github.com/dgoodmaniii/dozenal/";
maintainers = with stdenv.lib.maintainers; [ CharlesHD ]; maintainers = with lib.maintainers; [ CharlesHD ];
license = stdenv.lib.licenses.gpl3; license = lib.licenses.gpl3;
}; };
} }

View file

@ -58,7 +58,7 @@ python3.pkgs.buildPythonApplication {
cp -ar ${tests} $sourceRoot/electrum/tests cp -ar ${tests} $sourceRoot/electrum/tests
''; '';
nativeBuildInputs = stdenv.lib.optionals enableQt [ wrapQtAppsHook ]; nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ];
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [
aiohttp aiohttp
@ -81,7 +81,7 @@ python3.pkgs.buildPythonApplication {
keepkey keepkey
trezor trezor
btchip btchip
] ++ stdenv.lib.optionals enableQt [ pyqt5 qdarkstyle ]; ] ++ lib.optionals enableQt [ pyqt5 qdarkstyle ];
preBuild = '' preBuild = ''
sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py
@ -94,7 +94,7 @@ python3.pkgs.buildPythonApplication {
sed -i '/qdarkstyle/d' contrib/requirements/requirements.txt sed -i '/qdarkstyle/d' contrib/requirements/requirements.txt
''); '');
postInstall = stdenv.lib.optionalString stdenv.isLinux '' postInstall = lib.optionalString stdenv.isLinux ''
# Despite setting usr_share above, these files are installed under # Despite setting usr_share above, these files are installed under
# $out/nix ... # $out/nix ...
mv $out/${python3.sitePackages}/nix/store"/"*/share $out mv $out/${python3.sitePackages}/nix/store"/"*/share $out
@ -108,7 +108,7 @@ python3.pkgs.buildPythonApplication {
''; '';
postFixup = stdenv.lib.optionalString enableQt '' postFixup = lib.optionalString enableQt ''
wrapQtApp $out/bin/electrum wrapQtApp $out/bin/electrum
''; '';

View file

@ -25,7 +25,7 @@
, enableSystemd ? false , enableSystemd ? false
}: }:
with stdenv.lib; with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "elogind"; pname = "elogind";

View file

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Simple tool for input event debugging"; description = "Simple tool for input event debugging";
license = stdenv.lib.licenses.gpl2; license = lib.licenses.gpl2;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ]; maintainers = [ maintainers.bjornfor ];
}; };

View file

@ -1,4 +1,5 @@
{ stdenv { lib
, stdenv
, buildGoModule , buildGoModule
, fetchFromGitHub , fetchFromGitHub
, sqlite , sqlite
@ -26,7 +27,7 @@ buildGoModule rec {
"-ldflags=-s -w -X github.com/manojkarthick/expenses/cmd.Version=${version}" "-ldflags=-s -w -X github.com/manojkarthick/expenses/cmd.Version=${version}"
]; ];
meta = with stdenv.lib; { meta = with lib; {
description = "An interactive command line expense logger"; description = "An interactive command line expense logger";
license = licenses.mit; license = licenses.mit;
maintainers = [ maintainers.manojkarthick ]; maintainers = [ maintainers.manojkarthick ];

View file

@ -23,12 +23,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ]; nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ];
buildInputs = [ wxGTK30 glib pcre ] buildInputs = [ wxGTK30 glib pcre ]
++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa;
postPatch = stdenv.lib.optionalString stdenv.isLinux '' postPatch = lib.optionalString stdenv.isLinux ''
substituteInPlace far2l/bootstrap/trash.sh \ substituteInPlace far2l/bootstrap/trash.sh \
--replace 'gvfs-trash' '${gvfs}/bin/gvfs-trash' --replace 'gvfs-trash' '${gvfs}/bin/gvfs-trash'
'' + stdenv.lib.optionalString stdenv.isDarwin '' '' + lib.optionalString stdenv.isDarwin ''
substituteInPlace far2l/CMakeLists.txt \ substituteInPlace far2l/CMakeLists.txt \
--replace "-framework System" -lSystem --replace "-framework System" -lSystem
'' + '' '' + ''
@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/share/icons/hicolor/$size/apps mkdir -p $out/share/icons/hicolor/$size/apps
convert -size $size ../far2l/DE/icons/hicolor/$size/apps/far2l.svg $out/share/icons/hicolor/$size/apps/far2l.png convert -size $size ../far2l/DE/icons/hicolor/$size/apps/far2l.svg $out/share/icons/hicolor/$size/apps/far2l.png
done done
'' + stdenv.lib.optionalString stdenv.isDarwin '' '' + lib.optionalString stdenv.isDarwin ''
wrapProgram $out/bin/far2l --argv0 $out/bin/far2l wrapProgram $out/bin/far2l --argv0 $out/bin/far2l
''; '';

View file

@ -6,7 +6,7 @@
, AppKit, Cocoa , AppKit, Cocoa
}: }:
with stdenv.lib; with lib;
assert elem uiTarget [ "desktop" "macosx" ]; assert elem uiTarget [ "desktop" "macosx" ];
assert elem uiType [ "qt4" "gtk" "cocoa" ]; assert elem uiType [ "qt4" "gtk" "cocoa" ];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, openssl }: { lib, stdenv, fetchurl, openssl }:
let let
version = "6.4.14"; version = "6.4.14";
@ -28,8 +28,8 @@ stdenv.mkDerivation {
IPSEC. IPSEC.
''; '';
platforms = stdenv.lib.platforms.unix; platforms = lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.peti ]; maintainers = [ lib.maintainers.peti ];
license = stdenv.lib.licenses.gpl2Plus; license = lib.licenses.gpl2Plus;
}; };
} }

View file

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "14ymdw6l6phnil0xf1frd5kgznaiwppcic0v4hb61s1zpf4wrshg"; sha256 = "14ymdw6l6phnil0xf1frd5kgznaiwppcic0v4hb61s1zpf4wrshg";
}; };
pathAdd = stdenv.lib.makeSearchPath "bin" ([ xdg_utils file coreutils w3m xdotool ]); pathAdd = lib.makeSearchPath "bin" ([ xdg_utils file coreutils w3m xdotool ]);
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ bashInteractive ]; buildInputs = [ bashInteractive ];

View file

@ -2,7 +2,7 @@
withCuda ? true withCuda ? true
}: }:
with stdenv.lib; with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "firestarter"; pname = "firestarter";
version = "1.7.4"; version = "1.7.4";

View file

@ -7,7 +7,7 @@ let
pname = "gtkglarea"; pname = "gtkglarea";
version = "2.1.0"; version = "2.1.0";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1pl2vdj6l64j864ilhkq1bcggb3hrlxjwk5m029i7xfjfxc587lf"; sha256 = "1pl2vdj6l64j864ilhkq1bcggb3hrlxjwk5m029i7xfjfxc587lf";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

View file

@ -1,10 +1,10 @@
{ stdenv, fetchFromGitHub, python, pkgconfig, cmake, bluez, libusb1, curl { lib, stdenv, fetchFromGitHub, python, pkgconfig, cmake, bluez, libusb1, curl
, libiconv, gettext, sqlite , libiconv, gettext, sqlite
, dbiSupport ? false, libdbi ? null, libdbiDrivers ? null , dbiSupport ? false, libdbi ? null, libdbiDrivers ? null
, postgresSupport ? false, postgresql ? null , postgresSupport ? false, postgresql ? null
}: }:
with stdenv.lib; with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gammu"; pname = "gammu";

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, garmintools, libgcrypt, libusb-compat-0_1, pkgconfig, tinyxml, zlib }: { lib, stdenv, fetchurl, garmintools, libgcrypt, libusb-compat-0_1, pkgconfig, tinyxml, zlib }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "garmin-plugin-0.3.26"; name = "garmin-plugin-0.3.26";
src = fetchurl { src = fetchurl {
@ -19,8 +19,8 @@ stdenv.mkDerivation {
''; '';
meta = { meta = {
homepage = "http://www.andreas-diesner.de/garminplugin"; homepage = "http://www.andreas-diesner.de/garminplugin";
license = stdenv.lib.licenses.gpl3; license = lib.licenses.gpl3;
maintainers = [ ]; maintainers = [ ];
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
}; };
} }

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ncurses, fetchpatch }: { lib, stdenv, fetchurl, ncurses, fetchpatch }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gcal"; pname = "gcal";
@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
also displays holiday lists for many countries around the globe. also displays holiday lists for many countries around the globe.
''; '';
homepage = "https://www.gnu.org/software/gcal/"; homepage = "https://www.gnu.org/software/gcal/";
license = stdenv.lib.licenses.gpl3Plus; license = lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.unix; platforms = lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.romildo ]; maintainers = [ lib.maintainers.romildo ];
}; };
} }

View file

@ -1,6 +1,6 @@
{stdenv, fetchFromGitHub, atomicparsley, flvstreamer, ffmpeg_3, makeWrapper, perl, perlPackages, rtmpdump}: { lib, stdenv, fetchFromGitHub, atomicparsley, flvstreamer, ffmpeg_3, makeWrapper, perl, perlPackages, rtmpdump}:
with stdenv.lib; with lib;
perlPackages.buildPerlPackage rec { perlPackages.buildPerlPackage rec {
pname = "get_iplayer"; pname = "get_iplayer";

View file

@ -1,7 +1,7 @@
{ fetchurl, stdenv, gettext, pkgconfig, glib, gtk2, libX11, libSM, libICE, which { lib, fetchurl, stdenv, gettext, pkgconfig, glib, gtk2, libX11, libSM, libICE, which
, IOKit ? null }: , IOKit ? null }:
with stdenv.lib; with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gkrellm-2.3.11"; name = "gkrellm-2.3.11";

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtk2, gnome2, gnome3, libgksu, { lib, stdenv, fetchurl, pkgconfig, gtk2, gnome2, gnome3, libgksu,
intltool, libstartup_notification, gtk-doc, wrapGAppsHook intltool, libstartup_notification, gtk-doc, wrapGAppsHook
}: }:
@ -46,8 +46,8 @@ stdenv.mkDerivation rec {
as another user. as another user.
''; '';
homepage = "https://www.nongnu.org/gksu/"; homepage = "https://www.nongnu.org/gksu/";
license = stdenv.lib.licenses.gpl2; license = lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.romildo ]; maintainers = [ lib.maintainers.romildo ];
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
}; };
} }

View file

@ -3,7 +3,7 @@
, enableGlfw ? false, glfw, runtimeShell }: , enableGlfw ? false, glfw, runtimeShell }:
let let
inherit (stdenv.lib) optional makeLibraryPath; inherit (lib) optional makeLibraryPath;
wrapperScript = writeScript "glava" '' wrapperScript = writeScript "glava" ''
#!${runtimeShell} #!${runtimeShell}

View file

@ -54,7 +54,7 @@ in stdenv.mkDerivation rec {
outputs = [ "out" "lib" "dev" "doc" "devdoc" ]; outputs = [ "out" "lib" "dev" "doc" "devdoc" ];
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1wcd4kd3crwqjv0jfp73jkyyf5ws8mvykg37kqxmcb58piz21gsk"; sha256 = "1wcd4kd3crwqjv0jfp73jkyyf5ws8mvykg37kqxmcb58piz21gsk";
}; };
@ -101,7 +101,7 @@ in stdenv.mkDerivation rec {
preConfigure = "NOCONFIGURE=1 ./autogen.sh"; preConfigure = "NOCONFIGURE=1 ./autogen.sh";
configureFlags = [ configureFlags = [
"--with-boost-python=boost_python${stdenv.lib.versions.major python3.version}${stdenv.lib.versions.minor python3.version}" "--with-boost-python=boost_python${lib.versions.major python3.version}${lib.versions.minor python3.version}"
]; ];
makeFlags = [ makeFlags = [

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, libmtp, libid3tag, flac, libvorbis, gtk3 { lib, stdenv, fetchurl, pkgconfig, libmtp, libid3tag, flac, libvorbis, gtk3
, gsettings-desktop-schemas, wrapGAppsHook , gsettings-desktop-schemas, wrapGAppsHook
}: }:
@ -25,8 +25,8 @@ stdenv.mkDerivation {
meta = { meta = {
description = "A simple MP3 and Media player client for UNIX and UNIX like systems"; description = "A simple MP3 and Media player client for UNIX and UNIX like systems";
homepage = "https://gmtp.sourceforge.io"; homepage = "https://gmtp.sourceforge.io";
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
maintainers = [ ]; maintainers = [ ];
license = stdenv.lib.licenses.bsd3; license = lib.licenses.bsd3;
}; };
} }

View file

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
version = "3.32.1"; version = "3.32.1";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1apdd8yi12zagf82k376a9wmdm27wzwdxpm2wf2pnwkaf786rmdw"; sha256 = "1apdd8yi12zagf82k376a9wmdm27wzwdxpm2wf2pnwkaf786rmdw";
}; };

View file

@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1yymii3yf823d9x28fbhqdqm1wa30s40j94x0am9fjj0nzyd5s8v"; sha256 = "1yymii3yf823d9x28fbhqdqm1wa30s40j94x0am9fjj0nzyd5s8v";
}; };

View file

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
version = "3.38.0"; version = "3.38.0";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0mqs39yi2cqwkzlmmgzrszsva5hbdpws6zk4lbi4w2cjzl185mcl"; sha256 = "0mqs39yi2cqwkzlmmgzrszsva5hbdpws6zk4lbi4w2cjzl185mcl";
}; };

View file

@ -21,28 +21,28 @@ mkDerivation rec {
patches = [ patches = [
./0001-dont-check-for-updates.patch ./0001-dont-check-for-updates.patch
] ++ stdenv.lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
./0001-dont-use-maclibs.patch ./0001-dont-use-maclibs.patch
]; ];
postPatch = '' postPatch = ''
substituteInPlace goldendict.pro \ substituteInPlace goldendict.pro \
--replace "hunspell-1.6.1" "hunspell-${stdenv.lib.versions.majorMinor hunspell.version}" --replace "hunspell-1.6.1" "hunspell-${lib.versions.majorMinor hunspell.version}"
''; '';
nativeBuildInputs = [ pkgconfig qmake ]; nativeBuildInputs = [ pkgconfig qmake ];
buildInputs = [ buildInputs = [
qtbase qtsvg qtwebkit qttools qtbase qtsvg qtwebkit qttools
libvorbis hunspell xz lzo libvorbis hunspell xz lzo
] ++ stdenv.lib.optionals stdenv.isLinux [ qtx11extras libXtst ] ] ++ lib.optionals stdenv.isLinux [ qtx11extras libXtst ]
++ stdenv.lib.optionals stdenv.isDarwin [ bzip2 libiconv ] ++ lib.optionals stdenv.isDarwin [ bzip2 libiconv ]
++ stdenv.lib.optional withCC opencc ++ lib.optional withCC opencc
++ stdenv.lib.optional withEpwing libeb ++ lib.optional withEpwing libeb
++ stdenv.lib.optional withExtraTiff libtiff ++ lib.optional withExtraTiff libtiff
++ stdenv.lib.optionals withFFmpeg [ libao ffmpeg_3 ] ++ lib.optionals withFFmpeg [ libao ffmpeg_3 ]
++ stdenv.lib.optional withZim zstd; ++ lib.optional withZim zstd;
qmakeFlags = with stdenv.lib; [ qmakeFlags = with lib; [
"goldendict.pro" "goldendict.pro"
(optional withCC "CONFIG+=chinese_conversion_support") (optional withCC "CONFIG+=chinese_conversion_support")
(optional (!withCC) "CONFIG+=no_chinese_conversion_support") (optional (!withCC) "CONFIG+=no_chinese_conversion_support")
@ -53,7 +53,7 @@ mkDerivation rec {
(optional withZim "CONFIG+=zim_support") (optional withZim "CONFIG+=zim_support")
]; ];
postInstall = stdenv.lib.optionalString stdenv.isDarwin '' postInstall = lib.optionalString stdenv.isDarwin ''
mkdir -p $out/Applications mkdir -p $out/Applications
mv GoldenDict.app $out/Applications mv GoldenDict.app $out/Applications
wrapQtApp $out/Applications/GoldenDict.app/Contents/MacOS/GoldenDict wrapQtApp $out/Applications/GoldenDict.app/Contents/MacOS/GoldenDict

View file

@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
in '' in ''
mkdir -p $out/bin mkdir -p $out/bin
makeWrapper ${env}/bin/gollum $out/bin/gollum \ makeWrapper ${env}/bin/gollum $out/bin/gollum \
--prefix PATH ":" ${stdenv.lib.makeBinPath [ git ]} --prefix PATH ":" ${lib.makeBinPath [ git ]}
makeWrapper ${env}/bin/gollum-migrate-tags $out/bin/gollum-migrate-tags \ makeWrapper ${env}/bin/gollum-migrate-tags $out/bin/gollum-migrate-tags \
--prefix PATH ":" ${stdenv.lib.makeBinPath [ git ]} --prefix PATH ":" ${lib.makeBinPath [ git ]}
''; '';
passthru.updateScript = bundlerUpdateScript "gollum"; passthru.updateScript = bundlerUpdateScript "gollum";

View file

@ -463,4 +463,4 @@
}; };
version = "0.16.10"; version = "0.16.10";
}; };
} }

View file

@ -12,7 +12,7 @@ let
then "0dwnppn5snl5bwkdrgj4cyylnhngi0g66fn2k41j3dvis83x24k6" then "0dwnppn5snl5bwkdrgj4cyylnhngi0g66fn2k41j3dvis83x24k6"
else "0gndbxrj3kgc2dhjqwjifr3cl85hgpm695z0wi01wvwzhrjqs0l2"; else "0gndbxrj3kgc2dhjqwjifr3cl85hgpm695z0wi01wvwzhrjqs0l2";
version = "7.1.8.3036"; version = "7.1.8.3036";
fullPath = stdenv.lib.makeLibraryPath [ fullPath = lib.makeLibraryPath [
glibc glibc
glib glib
stdenv.cc.cc stdenv.cc.cc

View file

@ -1,4 +1,4 @@
{ fetchurl, stdenv, ncurses, gnupg }: { fetchurl, lib, stdenv, ncurses, gnupg }:
let version = "0.7.4"; let version = "0.7.4";
in stdenv.mkDerivation { in stdenv.mkDerivation {
@ -7,7 +7,7 @@ in stdenv.mkDerivation {
inherit version; inherit version;
meta = { meta = {
homepage = "https://tamentis.com/projects/mdp/"; homepage = "https://tamentis.com/projects/mdp/";
license = [stdenv.lib.licenses.isc]; license = [lib.licenses.isc];
description = "Manage your passwords with GnuPG and a text editor"; description = "Manage your passwords with GnuPG and a text editor";
}; };
src = fetchurl { src = fetchurl {

View file

@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-zlib=system" ] configureFlags = [ "--with-zlib=system" ]
# Floating point behavior on i686 causes test failures. Preventing # Floating point behavior on i686 causes test failures. Preventing
# extended precision fixes this problem. # extended precision fixes this problem.
++ stdenv.lib.optionals stdenv.isi686 [ ++ lib.optionals stdenv.isi686 [
"CFLAGS=-ffloat-store" "CXXFLAGS=-ffloat-store" "CFLAGS=-ffloat-store" "CXXFLAGS=-ffloat-store"
]; ];

View file

@ -29,7 +29,7 @@ mkDerivation {
''; '';
qtWrapperArgs = [ qtWrapperArgs = [
"--prefix PATH : ${stdenv.lib.makeBinPath [ gpsbabel ]}" "--prefix PATH : ${lib.makeBinPath [ gpsbabel ]}"
]; ];
postInstall = '' postInstall = ''

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook }: { lib, stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gpx"; pname = "gpx";
@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Gcode to x3g conversion postprocessor"; description = "Gcode to x3g conversion postprocessor";
homepage = "https://github.com/markwal/GPX/"; homepage = "https://github.com/markwal/GPX/";
license = stdenv.lib.licenses.gpl2; license = lib.licenses.gpl2;
platforms = stdenv.lib.platforms.unix; platforms = lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.leo60228 ]; maintainers = [ lib.maintainers.leo60228 ];
}; };
} }

View file

@ -15,11 +15,11 @@ in buildPythonApplication rec {
nativeBuildInputs = [ wrapGAppsHook intltool gettext ]; nativeBuildInputs = [ wrapGAppsHook intltool gettext ];
buildInputs = [ gtk3 gobject-introspection pango gexiv2 ] buildInputs = [ gtk3 gobject-introspection pango gexiv2 ]
# Map support # Map support
++ stdenv.lib.optional enableOSM osm-gps-map ++ lib.optional enableOSM osm-gps-map
# Graphviz support # Graphviz support
++ stdenv.lib.optional enableGraphviz graphviz ++ lib.optional enableGraphviz graphviz
# Ghostscript support # Ghostscript support
++ stdenv.lib.optional enableGhostscript ghostscript ++ lib.optional enableGhostscript ghostscript
; ;
src = fetchFromGitHub { src = fetchFromGitHub {

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gtk2, glib, pkgconfig, libgnome, libgnomeui, vte { lib, stdenv, fetchurl, gtk2, glib, pkgconfig, libgnome, libgnomeui, vte
, curl, cdparanoia, libid3tag, ncurses, libtool }: , curl, cdparanoia, libid3tag, ncurses, libtool }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "GTK-based audio CD player/ripper"; description = "GTK-based audio CD player/ripper";
homepage = "http://nostatic.org/grip"; homepage = "http://nostatic.org/grip";
license = stdenv.lib.licenses.gpl2; license = lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ marcweber peti ]; maintainers = with lib.maintainers; [ marcweber peti ];
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
}; };
} }

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, automake, autoconf, pkgconfig, gtk3 }: { lib, stdenv, fetchurl, automake, autoconf, pkgconfig, gtk3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gsimplecal"; pname = "gsimplecal";
@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
Also, you can configure it to not only show the calendar, but also Also, you can configure it to not only show the calendar, but also
display multiple clocks for different world time zones. display multiple clocks for different world time zones.
''; '';
license = stdenv.lib.licenses.bsd3; license = lib.licenses.bsd3;
maintainers = [ stdenv.lib.maintainers.romildo ]; maintainers = [ lib.maintainers.romildo ];
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
}; };
} }

View file

@ -1,4 +1,4 @@
{ stdenv, pkgs { lib, stdenv, pkgs
, glib, gnome3, gtk3, gtksourceview3, gtkspell3, poppler, texlive , glib, gnome3, gtk3, gtksourceview3, gtkspell3, poppler, texlive
, pkgconfig, intltool, autoreconfHook, wrapGAppsHook , pkgconfig, intltool, autoreconfHook, wrapGAppsHook
}: }:
@ -29,9 +29,9 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = "https://gummi.app"; homepage = "https://gummi.app";
description = "Simple LaTex editor for GTK users"; description = "Simple LaTex editor for GTK users";
license = stdenv.lib.licenses.mit; license = lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [ flokli ]; maintainers = with lib.maintainers; [ flokli ];
platforms = with stdenv.lib.platforms; linux; platforms = with lib.platforms; linux;
inherit version; inherit version;
}; };
} }

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, Xaw3d, ghostscriptX, perl, pkgconfig, libiconv }: { lib, stdenv, fetchurl, Xaw3d, ghostscriptX, perl, pkgconfig, libiconv }:
let let
name = "gv-3.7.4"; name = "gv-3.7.4";
@ -11,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "0q8s43z14vxm41pfa8s5h9kyyzk1fkwjhkiwbf2x70alm6rv6qi1"; sha256 = "0q8s43z14vxm41pfa8s5h9kyyzk1fkwjhkiwbf2x70alm6rv6qi1";
}; };
configureFlags = stdenv.lib.optionals stdenv.isDarwin [ configureFlags = lib.optionals stdenv.isDarwin [
"--enable-SIGCHLD-fallback" "--enable-SIGCHLD-fallback"
]; ];
@ -20,7 +20,7 @@ stdenv.mkDerivation {
ghostscriptX ghostscriptX
perl perl
pkgconfig pkgconfig
] ++ stdenv.lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
libiconv libiconv
]; ];
@ -41,8 +41,8 @@ stdenv.mkDerivation {
interface for the Ghostscript interpreter. interface for the Ghostscript interpreter.
''; '';
license = stdenv.lib.licenses.gpl3Plus; license = lib.licenses.gpl3Plus;
maintainers = [ ]; maintainers = [ ];
platforms = stdenv.lib.platforms.unix; platforms = lib.platforms.unix;
}; };
} }

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gtk3, intltool, pkgconfig, texinfo }: { lib, stdenv, fetchurl, gtk3, intltool, pkgconfig, texinfo }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gxmessage"; pname = "gxmessage";
@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "A GTK enabled dropin replacement for xmessage"; description = "A GTK enabled dropin replacement for xmessage";
homepage = "http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage"; homepage = "http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage";
license = stdenv.lib.licenses.gpl3; license = lib.licenses.gpl3;
maintainers = with stdenv.lib.maintainers; [jfb]; maintainers = with lib.maintainers; [jfb];
platforms = with stdenv.lib.platforms; linux; platforms = with lib.platforms; linux;
}; };
} }

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl }: { lib, stdenv, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.6.02"; version = "1.6.02";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Hebrew calendar and solar astronomical times library and utilities"; description = "Hebrew calendar and solar astronomical times library and utilities";
homepage = "https://sourceforge.net/projects/libhdate/"; homepage = "https://sourceforge.net/projects/libhdate/";
license = stdenv.lib.licenses.gpl3; license = lib.licenses.gpl3;
maintainers = with stdenv.lib.maintainers; [ CharlesHD ]; maintainers = with lib.maintainers; [ CharlesHD ];
}; };
} }

View file

@ -1,4 +1,4 @@
{ stdenv, runtimeShell }: { lib, stdenv, runtimeShell }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "example-unfree-package"; pname = "example-unfree-package";
@ -17,7 +17,7 @@ stdenv.mkDerivation {
meta = { meta = {
description = "An example package with unfree license (for testing)"; description = "An example package with unfree license (for testing)";
license = stdenv.lib.licenses.unfree; license = lib.licenses.unfree;
maintainers = [ stdenv.lib.maintainers.oxij ]; maintainers = [ lib.maintainers.oxij ];
}; };
} }

View file

@ -1,9 +1,9 @@
{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, libGL, alsaLib, dbus, xkeyboardconfig, bc, addOpenGLRunpath }: { lib, stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, libGL, alsaLib, dbus, xkeyboardconfig, bc, addOpenGLRunpath }:
let let
ld_library_path = builtins.concatStringsSep ":" [ ld_library_path = builtins.concatStringsSep ":" [
"${stdenv.cc.cc.lib}/lib64" "${stdenv.cc.cc.lib}/lib64"
(stdenv.lib.makeLibraryPath [ (lib.makeLibraryPath [
libGLU libGLU
libGL libGL
xorg.libXmu xorg.libXmu
@ -79,9 +79,9 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "3D animation application software"; description = "3D animation application software";
homepage = "https://www.sidefx.com"; homepage = "https://www.sidefx.com";
license = stdenv.lib.licenses.unfree; license = lib.licenses.unfree;
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.canndrew ]; maintainers = [ lib.maintainers.canndrew ];
}; };
} }

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, readline, ncurses { lib, stdenv, fetchFromGitHub, readline, ncurses
, autoreconfHook, pkgconfig, gettext }: , autoreconfHook, pkgconfig, gettext }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = "https://github.com/dvorka/hstr"; homepage = "https://github.com/dvorka/hstr";
description = "Shell history suggest box - easily view, navigate, search and use your command history"; description = "Shell history suggest box - easily view, navigate, search and use your command history";
license = stdenv.lib.licenses.asl20; license = lib.licenses.asl20;
maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; maintainers = [ lib.maintainers.matthiasbeyer ];
platforms = with stdenv.lib.platforms; linux ++ darwin; platforms = with lib.platforms; linux ++ darwin;
}; };
} }

View file

@ -9,7 +9,7 @@ let
inherit (data) version url sha256; inherit (data) version url sha256;
rpath = stdenv.lib.makeLibraryPath rpath = lib.makeLibraryPath
[ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft
libXinerama stdenv.cc.cc.lib libnotify glib gtk3 libappindicator-gtk3 libXinerama stdenv.cc.cc.lib libnotify glib gtk3 libappindicator-gtk3
curl libXfixes libXScrnSaver ]; curl libXfixes libXScrnSaver ];

View file

@ -1,6 +1,6 @@
{ stdenv, lib, fetchzip, freeglut, libXmu, libXi, libX11, libICE, libGLU, libGL, libSM, libXext, dialog, makeWrapper }: { stdenv, lib, fetchzip, freeglut, libXmu, libXi, libX11, libICE, libGLU, libGL, libSM, libXext, dialog, makeWrapper }:
let let
lpath = stdenv.lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU libGL libSM libXext ]; lpath = lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU libGL libSM libXext ];
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "iceSL"; pname = "iceSL";

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, perlPackages, gettext, makeWrapper, PerlMagick, which, highlight { lib, stdenv, fetchurl, perlPackages, gettext, makeWrapper, PerlMagick, which, highlight
, gitSupport ? false, git ? null , gitSupport ? false, git ? null
, docutilsSupport ? false, python ? null, docutils ? null , docutilsSupport ? false, python ? null, docutils ? null
, monotoneSupport ? false, monotone ? null , monotoneSupport ? false, monotone ? null
@ -20,8 +20,6 @@ assert mercurialSupport -> (mercurial != null);
let let
name = "ikiwiki"; name = "ikiwiki";
version = "3.20200202.3"; version = "3.20200202.3";
lib = stdenv.lib;
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "${name}-${version}"; name = "${name}-${version}";
@ -85,8 +83,8 @@ stdenv.mkDerivation {
meta = { meta = {
description = "Wiki compiler, storing pages and history in a RCS"; description = "Wiki compiler, storing pages and history in a RCS";
homepage = "http://ikiwiki.info/"; homepage = "http://ikiwiki.info/";
license = stdenv.lib.licenses.gpl2Plus; license = lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.peti ]; maintainers = [ lib.maintainers.peti ];
}; };
} }

View file

@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ installShellFiles pkg-config ]; nativeBuildInputs = [ installShellFiles pkg-config ];
buildInputs = [ openssl ] buildInputs = [ openssl ]
++ stdenv.lib.optional stdenv.isDarwin Security; ++ lib.optional stdenv.isDarwin Security;
checkInputs = [ gitMinimal util-linuxMinimal ]; checkInputs = [ gitMinimal util-linuxMinimal ];
LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; LIBCLANG_PATH = "${llvmPackages.libclang}/lib";

View file

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
patchelf \ patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" \ --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc ]}" \
"$out/opt/ipmicfg/IPMICFG-Linux.x86_64" "$out/opt/ipmicfg/IPMICFG-Linux.x86_64"
ln -s "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" "$out/bin/ipmicfg" ln -s "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" "$out/bin/ipmicfg"

View file

@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
else throw "IPMIView is not supported on this platform"; else throw "IPMIView is not supported on this platform";
in in
'' ''
patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/libawt_xawt.so patchelf --set-rpath "${lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/libawt_xawt.so
patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ freetype ]}" ./jre/lib/amd64/libfontmanager.so patchelf --set-rpath "${lib.makeLibraryPath [ freetype ]}" ./jre/lib/amd64/libfontmanager.so
patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./BMCSecurity/${stunnelBinary} patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./BMCSecurity/${stunnelBinary}
''; '';
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
# WORK_DIR: unfortunately the ikvm related binaries are loaded from # WORK_DIR: unfortunately the ikvm related binaries are loaded from
# and user configuration is written to files in the CWD # and user configuration is written to files in the CWD
makeWrapper $out/jre/bin/java $out/bin/IPMIView \ makeWrapper $out/jre/bin/java $out/bin/IPMIView \
--set LD_LIBRARY_PATH "${stdenv.lib.makeLibraryPath [ fontconfig gcc-unwrapped.lib ]}" \ --set LD_LIBRARY_PATH "${lib.makeLibraryPath [ fontconfig gcc-unwrapped.lib ]}" \
--prefix PATH : "$out/jre/bin:${iputils}/bin:${psmisc}/bin" \ --prefix PATH : "$out/jre/bin:${iputils}/bin:${psmisc}/bin" \
--add-flags "-jar $out/IPMIView20.jar" \ --add-flags "-jar $out/IPMIView20.jar" \
--run 'WORK_DIR=''${XDG_DATA_HOME:-~/.local/share}/ipmiview --run 'WORK_DIR=''${XDG_DATA_HOME:-~/.local/share}/ipmiview

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, java, runtimeShell }: { lib, stdenv, fetchurl, java, runtimeShell }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "jbidwatcher"; pname = "jbidwatcher";
@ -42,6 +42,6 @@ stdenv.mkDerivation rec {
binary. binary.
''; '';
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; platforms = lib.platforms.linux ++ lib.platforms.darwin;
}; };
} }

View file

@ -421,4 +421,4 @@
}; };
version = "2.4.2"; version = "2.4.2";
}; };
} }

View file

@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
xorg.libXinerama xorg.libXinerama
xorg.libXrandr xorg.libXrandr
python3Packages.python python3Packages.python
] ++ stdenv.lib.optionals enableXfcePanelApplet [ ] ++ lib.optionals enableXfcePanelApplet [
gtk3 gtk3
xfce.libxfce4util xfce.libxfce4util
xfce.xfce4-panel xfce.xfce4-panel
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
] ]
++ stdenv.lib.optionals enableXfcePanelApplet [ ++ lib.optionals enableXfcePanelApplet [
"--with-xfce4-panel-applet" "--with-xfce4-panel-applet"
]; ];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, db, gtk2, bzip2 }: { lib, stdenv, fetchurl, db, gtk2, bzip2 }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "jigdo-0.7.3"; name = "jigdo-0.7.3";
@ -24,7 +24,7 @@ stdenv.mkDerivation {
meta = { meta = {
description = "Download utility that can fetch files from several sources simultaneously"; description = "Download utility that can fetch files from several sources simultaneously";
homepage = "http://atterer.net/jigdo/"; homepage = "http://atterer.net/jigdo/";
license = stdenv.lib.licenses.gpl2; license = lib.licenses.gpl2;
platforms = stdenv.lib.platforms.unix; platforms = lib.platforms.unix;
}; };
} }

View file

@ -23,7 +23,7 @@ stdenv.mkDerivation {
dontUnpack = true; dontUnpack = true;
buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ jre makeWrapper ]; buildInputs = lib.optionals (!stdenv.isDarwin) [ jre makeWrapper ];
installPhase = installPhase =
if stdenv.isDarwin then '' if stdenv.isDarwin then ''

View file

@ -8,7 +8,7 @@
, enableTesseract ? true, leptonica, tesseract4 , enableTesseract ? true, leptonica, tesseract4
}: }:
with stdenv.lib; with lib;
# k2pdfopt is a pain to package. It requires modified versions of mupdf, # k2pdfopt is a pain to package. It requires modified versions of mupdf,
# leptonica, and tesseract. Instead of shipping patches for these upstream # leptonica, and tesseract. Instead of shipping patches for these upstream

View file

@ -1,9 +1,9 @@
{ stdenv, requireFile, unzip, rlwrap, bash, zlib }: { lib, stdenv, requireFile, unzip, rlwrap, bash, zlib }:
assert (stdenv.hostPlatform.system == "i686-linux"); assert (stdenv.hostPlatform.system == "i686-linux");
let let
libPath = stdenv.lib.makeLibraryPath libPath = lib.makeLibraryPath
[ stdenv.cc.libc stdenv.cc.cc zlib ]; [ stdenv.cc.libc stdenv.cc.cc zlib ];
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -68,8 +68,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Analytics and time-series database"; description = "Analytics and time-series database";
homepage = "http://www.kx.com/"; homepage = "http://www.kx.com/";
license = stdenv.lib.licenses.unfree; license = lib.licenses.unfree;
platforms = [ "i686-linux" ]; platforms = [ "i686-linux" ];
maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; maintainers = [ lib.maintainers.thoughtpolice ];
}; };
} }

View file

@ -1,4 +1,4 @@
{ stdenv, buildEnv, fetchzip, mono }: { lib, stdenv, buildEnv, fetchzip, mono }:
let let
version = "0.12.0"; version = "0.12.0";
@ -15,8 +15,8 @@ let
meta = { meta = {
description = "KeePass plugin to allow other programs to access SSH keys stored in a KeePass database for authentication"; description = "KeePass plugin to allow other programs to access SSH keys stored in a KeePass database for authentication";
homepage = "http://lechnology.com/software/keeagent"; homepage = "http://lechnology.com/software/keeagent";
platforms = with stdenv.lib.platforms; linux; platforms = with lib.platforms; linux;
license = stdenv.lib.licenses.gpl2; license = lib.licenses.gpl2;
maintainers = [ ]; maintainers = [ ];
}; };

View file

@ -1,4 +1,4 @@
{ stdenv, buildEnv, fetchFromGitHub, mono }: { lib, stdenv, buildEnv, fetchFromGitHub, mono }:
let let
version = "1.8.4.2"; version = "1.8.4.2";
@ -18,8 +18,8 @@ let
meta = { meta = {
description = "KeePass plugin to expose password entries securely (256bit AES/CBC) over HTTP"; description = "KeePass plugin to expose password entries securely (256bit AES/CBC) over HTTP";
homepage = "https://github.com/pfn/keepasshttp"; homepage = "https://github.com/pfn/keepasshttp";
platforms = with stdenv.lib.platforms; linux; platforms = with lib.platforms; linux;
license = stdenv.lib.licenses.gpl3; license = lib.licenses.gpl3;
}; };
pluginFilename = "KeePassHttp.plgx"; pluginFilename = "KeePassHttp.plgx";

View file

@ -1,4 +1,4 @@
{ stdenv, buildEnv, fetchzip, mono }: { lib, stdenv, buildEnv, fetchzip, mono }:
let let
version = "2.6"; version = "2.6";
@ -15,9 +15,9 @@ let
meta = { meta = {
description = "OtpKeyProv is a key provider based on one-time passwords"; description = "OtpKeyProv is a key provider based on one-time passwords";
homepage = "https://keepass.info/plugins.html#otpkeyprov"; homepage = "https://keepass.info/plugins.html#otpkeyprov";
platforms = with stdenv.lib.platforms; linux; platforms = with lib.platforms; linux;
license = stdenv.lib.licenses.gpl2; license = lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.ente ]; maintainers = [ lib.maintainers.ente ];
}; };
pluginFilename = "OtpKeyProv.plgx"; pluginFilename = "OtpKeyProv.plgx";

View file

@ -69,7 +69,7 @@ with builtins; buildDotnetPackage rec {
desktopName = "Keepass"; desktopName = "Keepass";
genericName = "Password manager"; genericName = "Password manager";
categories = "Utility;"; categories = "Utility;";
mimeType = stdenv.lib.concatStringsSep ";" [ mimeType = lib.concatStringsSep ";" [
"application/x-keepass2" "application/x-keepass2"
"" ""
]; ];
@ -85,7 +85,7 @@ with builtins; buildDotnetPackage rec {
# is found and does not pollute output path. # is found and does not pollute output path.
binPaths = lib.concatStrings (lib.intersperse ":" (map (x: x + "/bin") plugins)); binPaths = lib.concatStrings (lib.intersperse ":" (map (x: x + "/bin") plugins));
dynlibPath = stdenv.lib.makeLibraryPath [ gtk2 ]; dynlibPath = lib.makeLibraryPath [ gtk2 ];
postInstall = postInstall =
let let
@ -111,8 +111,8 @@ with builtins; buildDotnetPackage rec {
meta = { meta = {
description = "GUI password manager with strong cryptography"; description = "GUI password manager with strong cryptography";
homepage = "http://www.keepass.info/"; homepage = "http://www.keepass.info/";
maintainers = with stdenv.lib.maintainers; [ amorsillo obadz jraygauthier ]; maintainers = with lib.maintainers; [ amorsillo obadz jraygauthier ];
platforms = with stdenv.lib.platforms; all; platforms = with lib.platforms; all;
license = stdenv.lib.licenses.gpl2; license = lib.licenses.gpl2;
}; };
} }

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, libgcrypt, qt4, xorg }: { lib, stdenv, fetchurl, cmake, libgcrypt, qt4, xorg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "keepassx2"; pname = "keepassx2";
@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Qt password manager compatible with its Win32 and Pocket PC versions"; description = "Qt password manager compatible with its Win32 and Pocket PC versions";
homepage = "https://www.keepassx.org/"; homepage = "https://www.keepassx.org/";
license = stdenv.lib.licenses.gpl2; license = lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ qknight ]; maintainers = with lib.maintainers; [ qknight ];
platforms = with stdenv.lib.platforms; linux; platforms = with lib.platforms; linux;
}; };
} }

View file

@ -1,4 +1,4 @@
{ stdenv { lib, stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch , fetchpatch
, cmake , cmake
@ -36,7 +36,7 @@
, withKeePassFDOSecrets ? true , withKeePassFDOSecrets ? true
}: }:
with stdenv.lib; with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "keepassxc"; pname = "keepassxc";
@ -49,18 +49,18 @@ stdenv.mkDerivation rec {
sha256 = "032dzywvwpclhsl3n1pq2m9gyxqpg0gkci6axbvbs7bn82wznc4h"; sha256 = "032dzywvwpclhsl3n1pq2m9gyxqpg0gkci6axbvbs7bn82wznc4h";
}; };
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [ NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang [
"-Wno-old-style-cast" "-Wno-old-style-cast"
"-Wno-error" "-Wno-error"
"-D__BIG_ENDIAN__=${if stdenv.isBigEndian then "1" else "0"}" "-D__BIG_ENDIAN__=${if stdenv.isBigEndian then "1" else "0"}"
]; ];
postPatch = stdenv.lib.optionalString stdenv.isDarwin '' postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace CMakeLists.txt \ substituteInPlace CMakeLists.txt \
--replace "/usr/local/bin" "../bin" \ --replace "/usr/local/bin" "../bin" \
--replace "/usr/local/share/man" "../share/man" --replace "/usr/local/share/man" "../share/man"
''; '';
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib"; NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib";
patches = [ patches = [
./darwin.patch ./darwin.patch
@ -111,9 +111,9 @@ stdenv.mkDerivation rec {
yubikey-personalization yubikey-personalization
zlib zlib
] ]
++ stdenv.lib.optional withKeePassKeeShareSecure quazip ++ lib.optional withKeePassKeeShareSecure quazip
++ stdenv.lib.optional stdenv.isDarwin qtmacextras ++ lib.optional stdenv.isDarwin qtmacextras
++ stdenv.lib.optional (stdenv.isDarwin && withKeePassTouchID) darwin.apple_sdk.frameworks.LocalAuthentication; ++ lib.optional (stdenv.isDarwin && withKeePassTouchID) darwin.apple_sdk.frameworks.LocalAuthentication;
preFixup = optionalString stdenv.isDarwin '' preFixup = optionalString stdenv.isDarwin ''
# Make it work without Qt in PATH. # Make it work without Qt in PATH.

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, bzip2, qt4, qmake4Hook, libX11, xorgproto, libXtst }: { lib, stdenv, fetchurl, bzip2, qt4, qmake4Hook, libX11, xorgproto, libXtst }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "keepassx"; pname = "keepassx";
@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Qt password manager compatible with its Win32 and Pocket PC versions"; description = "Qt password manager compatible with its Win32 and Pocket PC versions";
homepage = "https://www.keepassx.org/"; homepage = "https://www.keepassx.org/";
license = stdenv.lib.licenses.gpl2; license = lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ qknight ]; maintainers = with lib.maintainers; [ qknight ];
platforms = with stdenv.lib.platforms; linux; platforms = with lib.platforms; linux;
}; };
} }

View file

@ -1,4 +1,4 @@
{ fetchzip, stdenv, jdk8, runtimeShell }: { fetchzip, lib, stdenv, jdk8, runtimeShell }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "5.4.4"; version = "5.4.4";
@ -33,8 +33,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Open source GUI replacement for the Java command-line utilities keytool and jarsigner"; description = "Open source GUI replacement for the Java command-line utilities keytool and jarsigner";
license = stdenv.lib.licenses.gpl3Only; license = lib.licenses.gpl3Only;
maintainers = [ stdenv.lib.maintainers.numinit ]; maintainers = [ lib.maintainers.numinit ];
platforms = stdenv.lib.platforms.unix; platforms = lib.platforms.unix;
}; };
} }

View file

@ -1,4 +1,4 @@
{ stdenv, glibcLocales, python3 }: { lib, stdenv, glibcLocales, python3 }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
version = "0.17.0"; version = "0.17.0";
@ -30,7 +30,7 @@ python3.pkgs.buildPythonApplication rec {
meta = { meta = {
homepage = "https://github.com/scheibler/khard"; homepage = "https://github.com/scheibler/khard";
description = "Console carddav client"; description = "Console carddav client";
license = stdenv.lib.licenses.gpl3; license = lib.licenses.gpl3;
maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; maintainers = with lib.maintainers; [ matthiasbeyer ];
}; };
} }

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, makeWrapper, pkg-config { lib, stdenv, fetchurl, makeWrapper, pkg-config
, zip, python, zlib, which, icu, libmicrohttpd, lzma, aria2, wget, bc , zip, python, zlib, which, icu, libmicrohttpd, lzma, aria2, wget, bc
, libuuid, libX11, libXext, libXt, libXrender, glib, dbus, dbus-glib , libuuid, libX11, libXext, libXt, libXrender, glib, dbus, dbus-glib
, gtk2, gdk-pixbuf, pango, cairo, freetype, fontconfig, alsaLib, atk, cmake , gtk2, gdk-pixbuf, pango, cairo, freetype, fontconfig, alsaLib, atk, cmake
, xapian, ctpp2, zimlib , xapian, ctpp2, zimlib
}: }:
with stdenv.lib; with lib;
let let
xulrunner64_tar = fetchurl { xulrunner64_tar = fetchurl {

View file

@ -37,7 +37,7 @@ in stdenv.mkDerivation rec {
done done
ln -s "${font-droid}/share/fonts/opentype/NerdFonts/Droid Sans Mono Nerd Font Complete Mono.otf" $out/lib/koreader/fonts/droid/DroidSansMono.ttf ln -s "${font-droid}/share/fonts/opentype/NerdFonts/Droid Sans Mono Nerd Font Complete Mono.otf" $out/lib/koreader/fonts/droid/DroidSansMono.ttf
wrapProgram $out/bin/koreader --prefix LD_LIBRARY_PATH : ${ wrapProgram $out/bin/koreader --prefix LD_LIBRARY_PATH : ${
stdenv.lib.makeLibraryPath [ gtk3-x11 SDL2 glib ] lib.makeLibraryPath [ gtk3-x11 SDL2 glib ]
} }
''; '';

View file

@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
runHook postInstall runHook postInstall
''; '';
meta = with stdenv.lib; { meta = with lib; {
description = "Master PDF Editor - version 4, without watermark"; description = "Master PDF Editor - version 4, without watermark";
homepage = "https://code-industry.net/free-pdf-editor/"; homepage = "https://code-industry.net/free-pdf-editor/";
license = licenses.unfreeRedistributable; license = licenses.unfreeRedistributable;

View file

@ -1,4 +1,4 @@
{ fetchFromGitHub, silver-searcher, tree, man, stdenv, { fetchFromGitHub, silver-searcher, tree, man, lib, stdenv,
git, git,
pandocSupport ? true, pandoc ? null pandocSupport ? true, pandoc ? null
, ... }: , ... }:
@ -45,8 +45,8 @@ stdenv.mkDerivation rec {
''; '';
homepage = "http://palovandalo.com/memo/"; homepage = "http://palovandalo.com/memo/";
downloadPage = "https://github.com/mrVanDalo/memo/releases"; downloadPage = "https://github.com/mrVanDalo/memo/releases";
license = stdenv.lib.licenses.gpl3; license = lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.mrVanDalo ]; maintainers = [ lib.maintainers.mrVanDalo ];
platforms = stdenv.lib.platforms.all; platforms = lib.platforms.all;
}; };
} }

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, unzip, pkgconfig, glib, llvmPackages }: { lib, stdenv, fetchFromGitHub, unzip, pkgconfig, glib, llvmPackages }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "milu-nightly"; pname = "milu-nightly";
@ -32,9 +32,9 @@ stdenv.mkDerivation {
meta = { meta = {
description = "Higher Order Mutation Testing Tool for C and C++ programs"; description = "Higher Order Mutation Testing Tool for C and C++ programs";
homepage = "https://github.com/yuejia/Milu"; homepage = "https://github.com/yuejia/Milu";
license = stdenv.lib.licenses.bsd2; license = lib.licenses.bsd2;
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.vrthra ]; maintainers = [ lib.maintainers.vrthra ];
}; };
} }

View file

@ -19,7 +19,7 @@ stdenv.mkDerivation {
interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2 interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2
patchelf --set-interpreter "$interpreter" $pgm patchelf --set-interpreter "$interpreter" $pgm
wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl stdenv.cc.cc ]} wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ openssl stdenv.cc.cc ]}
rm $out/usr/bin/minergate-cli rm $out/usr/bin/minergate-cli
mkdir -p $out/bin mkdir -p $out/bin

View file

@ -19,7 +19,7 @@ stdenv.mkDerivation {
interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2 interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2
patchelf --set-interpreter "$interpreter" $pgm patchelf --set-interpreter "$interpreter" $pgm
wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ fontconfig freetype openssl stdenv.cc.cc xorg.libX11 xorg.libxcb ]} --prefix "QT_XKB_CONFIG_ROOT" ":" "${xkeyboard_config}/share/X11/xkb" wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ fontconfig freetype openssl stdenv.cc.cc xorg.libX11 xorg.libxcb ]} --prefix "QT_XKB_CONFIG_ROOT" ":" "${xkeyboard_config}/share/X11/xkb"
rm $out/usr/bin/minergate rm $out/usr/bin/minergate
mkdir -p $out/bin mkdir -p $out/bin

View file

@ -41,7 +41,7 @@ stdenv.mkDerivation {
cp ${fastutil} lib/compile/${fastutil.name} cp ${fastutil} lib/compile/${fastutil.name}
cp ${osmpbf} lib/compile/${osmpbf.name} cp ${osmpbf} lib/compile/${osmpbf.name}
cp ${protobuf} lib/compile/${protobuf.name} cp ${protobuf} lib/compile/${protobuf.name}
'' + stdenv.lib.optionalString doCheck '' '' + lib.optionalString doCheck ''
mkdir -p lib/test mkdir -p lib/test
cp ${fastutil} lib/test/${fastutil.name} cp ${fastutil} lib/test/${fastutil.name}
cp ${osmpbf} lib/test/${osmpbf.name} cp ${osmpbf} lib/test/${osmpbf.name}
@ -51,7 +51,7 @@ stdenv.mkDerivation {
cp ${hamcrest-core} lib/test/${hamcrest-core.name} cp ${hamcrest-core} lib/test/${hamcrest-core.name}
mkdir -p test/resources/in/img mkdir -p test/resources/in/img
${stdenv.lib.concatMapStringsSep "\n" (res: '' ${lib.concatMapStringsSep "\n" (res: ''
cp ${res} test/resources/in/${builtins.replaceStrings [ "__" ] [ "/" ] res.name} cp ${res} test/resources/in/${builtins.replaceStrings [ "__" ] [ "/" ] res.name}
'') testInputs} '') testInputs}
''; '';
@ -70,7 +70,7 @@ stdenv.mkDerivation {
cp -r dist/lib/ $out/share/java/mkgmap/ cp -r dist/lib/ $out/share/java/mkgmap/
makeWrapper ${jre}/bin/java $out/bin/mkgmap \ makeWrapper ${jre}/bin/java $out/bin/mkgmap \
--add-flags "-jar $out/share/java/mkgmap/mkgmap.jar" --add-flags "-jar $out/share/java/mkgmap/mkgmap.jar"
'' + stdenv.lib.optionalString withExamples '' '' + lib.optionalString withExamples ''
mkdir -p $out/share/mkgmap mkdir -p $out/share/mkgmap
cp -r dist/examples $out/share/mkgmap/ cp -r dist/examples $out/share/mkgmap/
''; '';

View file

@ -41,13 +41,13 @@ stdenv.mkDerivation {
cp ${osmpbf} lib/compile/${osmpbf.name} cp ${osmpbf} lib/compile/${osmpbf.name}
cp ${protobuf} lib/compile/${protobuf.name} cp ${protobuf} lib/compile/${protobuf.name}
cp ${xpp3} lib/compile/${xpp3.name} cp ${xpp3} lib/compile/${xpp3.name}
'' + stdenv.lib.optionalString doCheck '' '' + lib.optionalString doCheck ''
mkdir -p lib/test mkdir -p lib/test
cp ${junit} lib/test/${junit.name} cp ${junit} lib/test/${junit.name}
cp ${hamcrest-core} lib/test/${hamcrest-core.name} cp ${hamcrest-core} lib/test/${hamcrest-core.name}
mkdir -p test/resources/in/osm mkdir -p test/resources/in/osm
${stdenv.lib.concatMapStringsSep "\n" (res: '' ${lib.concatMapStringsSep "\n" (res: ''
cp ${res} test/resources/in/${builtins.replaceStrings [ "__" ] [ "/" ] res.name} cp ${res} test/resources/in/${builtins.replaceStrings [ "__" ] [ "/" ] res.name}
'') testInputs} '') testInputs}
''; '';

Some files were not shown because too many files have changed in this diff Show more