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

pkgs/applications: stdenv.lib -> lib

Browse Source
This commit is contained in:
Ben Siraphob
2021-01-15 14:24:03 +07:00
parent 2e34288f0d
commit 108bdac3d9
427 changed files with 1160 additions and 1154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/misc/keepassx/2.0.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, libgcrypt, qt4, xorg }:
{ lib, stdenv, fetchurl, cmake, libgcrypt, qt4, xorg }:
stdenv.mkDerivation rec {
pname = "keepassx2";
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Qt password manager compatible with its Win32 and Pocket PC versions";
homepage = "https://www.keepassx.org/";
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ qknight ];
platforms = with stdenv.lib.platforms; linux;
license = lib.licenses.gpl2;
maintainers = with lib.maintainers; [ qknight ];
platforms = with lib.platforms; linux;
};
}
pkgs/applications/misc/keepassx/community.nix
+8 -8
View File
@@ -1,4 +1,4 @@
{ stdenv
{ lib, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
@@ -36,7 +36,7 @@
, withKeePassFDOSecrets ? true
}:
with stdenv.lib;
with lib;
stdenv.mkDerivation rec {
pname = "keepassxc";
@@ -49,18 +49,18 @@ stdenv.mkDerivation rec {
sha256 = "032dzywvwpclhsl3n1pq2m9gyxqpg0gkci6axbvbs7bn82wznc4h";
};
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang [
"-Wno-old-style-cast"
"-Wno-error"
"-D__BIG_ENDIAN__=${if stdenv.isBigEndian then "1" else "0"}"
];
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace CMakeLists.txt \
--replace "/usr/local/bin" "../bin" \
--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 = [
./darwin.patch
@@ -111,9 +111,9 @@ stdenv.mkDerivation rec {
yubikey-personalization
zlib
]
++ stdenv.lib.optional withKeePassKeeShareSecure quazip
++ stdenv.lib.optional stdenv.isDarwin qtmacextras
++ stdenv.lib.optional (stdenv.isDarwin && withKeePassTouchID) darwin.apple_sdk.frameworks.LocalAuthentication;
++ lib.optional withKeePassKeeShareSecure quazip
++ lib.optional stdenv.isDarwin qtmacextras
++ lib.optional (stdenv.isDarwin && withKeePassTouchID) darwin.apple_sdk.frameworks.LocalAuthentication;
preFixup = optionalString stdenv.isDarwin ''
# Make it work without Qt in PATH.
pkgs/applications/misc/keepassx/default.nix
+4 -4
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 {
pname = "keepassx";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Qt password manager compatible with its Win32 and Pocket PC versions";
homepage = "https://www.keepassx.org/";
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ qknight ];
platforms = with stdenv.lib.platforms; linux;
license = lib.licenses.gpl2;
maintainers = with lib.maintainers; [ qknight ];
platforms = with lib.platforms; linux;
};
}