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

Merge staging into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2021-03-08 19:20:18 +01:00
parent 6ba8f344c6 042adf08d1
commit 277d488026
374 changed files with 3871 additions and 2493 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/security/bmrsa/11.nix
+1 -1
View File
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0ksd9xkvm9lkvj4yl5sl0zmydp1wn3xhc55b28gj70gi4k75kcl4";
};
buildInputs = [ unzip ];
nativeBuildInputs = [ unzip ];
unpackPhase = ''
mkdir bmrsa
pkgs/tools/security/chntpw/default.nix
+2 -2
View File
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "1k1cxsj0221dpsqi5yibq2hr7n8xywnicl8yyaicn91y8h2hkqln";
};
buildInputs = [ unzip ]
++ lib.optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ];
nativeBuildInputs = [ unzip ];
buildInputs = lib.optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ];
patches = [
./00-chntpw-build-arch-autodetect.patch
pkgs/tools/security/pcsc-scm-scl011/default.nix
+1 -1
View File
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "0ik26sxgqgsqplksl87z61vwmx51k7plaqmrkdid7xidgfhfxr42";
};
buildInputs = [ unzip ];
nativeBuildInputs = [ unzip ];
unpackPhase = ''
unzip $src
pkgs/tools/security/pinentry/mac.nix
+6
View File
@@ -14,6 +14,12 @@ stdenv.mkDerivation {
nativeBuildInputs = [ xcbuildHook ];
buildInputs = [ libiconv ncurses Cocoa ];
preBuild = ''
# Only build for what we care about (also allows arm64)
substituteInPlace pinentry-mac.xcodeproj/project.pbxproj \
--replace "i386 x86_64 ppc" "${stdenv.targetPlatform.darwinArch}"
'';
installPhase = ''
mkdir -p $out/Applications
mv Products/Release/pinentry-mac.app $out/Applications
pkgs/tools/security/rarcrack/default.nix
+2 -1
View File
@@ -11,7 +11,8 @@ stdenv.mkDerivation {
sha256 = "134fq84896w5vp8vg4qg0ybpb466njibigyd7bqqm1xydr07qrgn";
};
buildInputs = [ libxml2 file p7zip unrar unzip ];
nativeBuildInputs = [ unzip ];
buildInputs = [ libxml2 file p7zip unrar ];
buildFlags = lib.optional stdenv.cc.isClang "CC=clang";
installFlags = [ "PREFIX=\${out}" ];
pkgs/tools/security/sonar-scanner-cli/default.nix
+1 -1
View File
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
src = fetchurl sonarScannerArchPackage.${stdenv.hostPlatform.system};
buildInputs = [ unzip ];
nativeBuildInputs = [ unzip ];
installPhase = ''
mkdir -p $out/lib