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

Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"

Browse Source 
This reverts commit c778945806.

I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
This commit is contained in:
Vladimír Čunát
2020-10-26 08:17:14 +01:00
parent 309ce3f8a1
commit 336bc8283b
92 changed files with 771 additions and 2686 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/nss/3.44.nix
View File

@@ -19,10 +19,10 @@ in stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ perl ];
nativeBuildInputs = [ perl ]
++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = [ zlib sqlite ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
buildInputs = [ zlib sqlite ];
propagatedBuildInputs = [ nspr ];

5
pkgs/development/libraries/nss/default.nix
View File

@@ -20,10 +20,9 @@ in stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ perl ninja (buildPackages.python3.withPackages (ps: with ps; [ gyp ])) ]
++ stdenv.lib.optional stdenv.isDarwin darwin.cctools;
++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ darwin.cctools fixDarwinDylibNames ];
buildInputs = [ zlib sqlite ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
buildInputs = [ zlib sqlite ];
propagatedBuildInputs = [ nspr ];