Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c447fb48791b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 41358258fbbb
Choose a head ref
  • 1 commit
  • 15 files changed
  • 1 contributor

Commits on Apr 24, 2021

  1. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    globin Robin Gloster
    Copy the full SHA
    4135825 View commit details
2 changes: 1 addition & 1 deletion pkgs/applications/audio/aacgain/default.nix
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ stdenv.mkDerivation {

# -Wnarrowing is enabled by default in recent GCC versions,
# causing compilation to fail.
NIX_CFLAGS_COMPILE = "-Wno-narrowing";
env.NIX_CFLAGS_COMPILE = "-Wno-narrowing";

postPatch = ''
(
2 changes: 1 addition & 1 deletion pkgs/applications/audio/oxefmsynth/default.nix
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
sha256 = "1rk71ls33a38wx8i22plsi7d89cqqxrfxknq5i4f9igsw1ipm4gn";
};

NIX_CFLAGS_COMPILE = [ "-Wno-error=narrowing" ];
env.NIX_CFLAGS_COMPILE = "-Wno-error=narrowing";

buildFlags = [ "VSTSDK_PATH=${vst-sdk}/VST2_SDK" ];

2 changes: 1 addition & 1 deletion pkgs/applications/misc/qlcplus/default.nix
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ mkDerivation rec {

qmakeFlags = [ "INSTALLROOT=$(out)" ];

NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";

postPatch = ''
patchShebangs .
2 changes: 1 addition & 1 deletion pkgs/applications/networking/calls/default.nix
Original file line number Diff line number Diff line change
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
xvfb_run
];

NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";

mesonFlags = [
"-Dgtk_doc=true"
4 changes: 2 additions & 2 deletions pkgs/applications/video/vlc/default.nix
Original file line number Diff line number Diff line change
@@ -54,11 +54,11 @@ stdenv.mkDerivation rec {

enableParallelBuilding = true;

LIVE555_PREFIX = if (!stdenv.hostPlatform.isAarch64) then live555 else null;
env.LIVE555_PREFIX = optionalString (!stdenv.hostPlatform.isAarch64) (toString live555);

# vlc depends on a c11-gcc wrapper script which we don't have so we need to
# set the path to the compiler
BUILDCC = "${stdenv.cc}/bin/gcc";
env.BUILDCC = "${stdenv.cc}/bin/gcc";

postPatch = ''
substituteInPlace modules/text_renderer/freetype/platform_fonts.h --replace \
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
# Including our own patch here since upstream commit patch doesnt apply cleanly on B3
./0001-client-all-fix-more-maybe-uninitialized-when-O3-is-i.patch
];
patchFlags = "-p2";
patchFlags = [ "-p2" ];

sourceRoot = "source/client";
env.NIX_CFLAGS_COMPILE = "-mavx"; # Fix some sort of AVX compiler problem.
2 changes: 1 addition & 1 deletion pkgs/desktops/xfce/core/xfce4-panel/default.nix
Original file line number Diff line number Diff line change
@@ -53,7 +53,7 @@ mkXfceDerivation {
'';

# Workaround https://bugzilla.xfce.org/show_bug.cgi?id=15825
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";

meta = {
description = "Xfce's panel";
5 changes: 2 additions & 3 deletions pkgs/development/compilers/llvm/12/compiler-rt/default.nix
Original file line number Diff line number Diff line change
@@ -16,9 +16,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake python3 llvm ];
buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi;

NIX_CFLAGS_COMPILE = [
"-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0"
];
env.NIX_CFLAGS_COMPILE =
"-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0";

cmakeFlags = [
"-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
2 changes: 1 addition & 1 deletion pkgs/development/compilers/llvm/12/llvm/default.nix
Original file line number Diff line number Diff line change
@@ -105,7 +105,7 @@ in stdenv.mkDerivation (rec {
'';

# E.g. mesa.drivers use the build-id as a cache key (see #93946):
LDFLAGS = optionalString (enableSharedLibraries && !stdenv.isDarwin) "-Wl,--build-id=sha1";
env.LDFLAGS = optionalString (enableSharedLibraries && !stdenv.isDarwin) "-Wl,--build-id=sha1";

cmakeFlags = with stdenv; [
"-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}"
6 changes: 2 additions & 4 deletions pkgs/development/libraries/mbedtls/default.nix
Original file line number Diff line number Diff line change
@@ -34,10 +34,8 @@ stdenv.mkDerivation rec {
'';

cmakeFlags = [ "-DUSE_SHARED_MBEDTLS_LIBRARY=on" ];
NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [
"-Wno-error=format"
"-Wno-error=format-truncation"
];
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU
"-Wno-error=format -Wno-error=format-truncation";

meta = with lib; {
homepage = "https://tls.mbed.org/";
2 changes: 1 addition & 1 deletion pkgs/development/libraries/openvino/default.nix
Original file line number Diff line number Diff line change
@@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
python
tbb
shellcheck
] ++ lib.optional enablePython (with python.pkgs; [
] ++ lib.optionals enablePython (with python.pkgs; [
cython
pybind11
]);
Original file line number Diff line number Diff line change
@@ -116,8 +116,8 @@ pythonPackages.callPackage
buildInputs = (
baseBuildInputs
++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) pythonPackages.setuptools
++ lib.optional (!isSource) (getManyLinuxDeps fileInfo.name).pkg
++ lib.optional isLocal buildSystemPkgs
++ lib.optionals (!isSource) (getManyLinuxDeps fileInfo.name).pkg
++ lib.optionals isLocal buildSystemPkgs
++ lib.optional (!__isBootstrap) pythonPackages.poetry
);

4 changes: 2 additions & 2 deletions pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
Original file line number Diff line number Diff line change
@@ -137,11 +137,11 @@ self: super:
cryptography = super.cryptography.overridePythonAttrs (
old: {
nativeBuildInputs = (old.nativeBuildInputs or [ ])
++ lib.optional (lib.versionAtLeast old.version "3.4") [ self.setuptools-rust ]
++ lib.optionals (lib.versionAtLeast old.version "3.4") [ self.setuptools-rust ]
++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) self.python.pythonForBuild.pkgs.cffi;
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.openssl ];
} // lib.optionalAttrs (lib.versionAtLeast old.version "3.4" && lib.versionOlder old.version "3.5") {
CRYPTOGRAPHY_DONT_BUILD_RUST = "1";
env = (old.env or {}) // { CRYPTOGRAPHY_DONT_BUILD_RUST = "1"; };
}
);

6 changes: 2 additions & 4 deletions pkgs/games/pinball/default.nix
Original file line number Diff line number Diff line change
@@ -23,10 +23,8 @@ stdenv.mkDerivation rec {
"--with-sdl-prefix=${lib.getDev SDL}"
];

NIX_CFLAGS_COMPILE = [
"-I${lib.getDev SDL_image}/include/SDL"
"-I${lib.getDev SDL_mixer}/include/SDL"
];
env.NIX_CFLAGS_COMPILE =
"-I${lib.getDev SDL_image}/include/SDL -I${lib.getDev SDL_mixer}/include/SDL";

enableParallelBuilding = true;

2 changes: 1 addition & 1 deletion pkgs/tools/filesystems/curlftpfs/default.nix
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ fuse curl glib zlib ];

CFLAGS = lib.optionalString stdenv.isDarwin "-D__off_t=off_t";
env.CFLAGS = lib.optionalString stdenv.isDarwin "-D__off_t=off_t";

postPatch = lib.optionalString stdenv.isDarwin ''
# Fix the build on macOS with macFUSE installed. Needs autoreconfHook for