Unverified Commit 4c37153a authored by Robert Hensing's avatar Robert Hensing Committed by GitHub
Browse files

Merge pull request #271241 from pbsds/finalattrs-docheck 

treewide: finalAttrs.doCheck -> finalAttrs.finalPackage.doCheck
parents b3caa5f5 ad5e7447

pkgs/by-name/db/dbus-cpp/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { 
    # pkg-config output patching hook expects prefix variable here

    substituteInPlace data/dbus-cpp.pc.in \

      --replace 'includedir=''${exec_prefix}' 'includedir=''${prefix}'

  '' + lib.optionalString (!finalAttrs.doCheck) ''

  '' + lib.optionalString (!finalAttrs.finalPackage.doCheck) ''

    sed -i -e '/add_subdirectory(tests)/d' CMakeLists.txt

  '';

pkgs/by-name/ne/net-cpp/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { 
    })

  ];



  postPatch = lib.optionalString finalAttrs.doCheck ''

  postPatch = lib.optionalString finalAttrs.finalPackage.doCheck ''

    # Use wrapped python. Removing just the /usr/bin doesn't seem to work?

    substituteInPlace tests/httpbin.h.in \

      --replace '/usr/bin/python3' '${lib.getExe pythonEnv}'

pkgs/by-name/tr/trealla/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { 
    ++ lib.optional enableSSL openssl

    ++ lib.optional (lineEditingLibrary == "readline") readline;



  nativeCheckInputs = lib.optionals finalAttrs.doCheck [ valgrind ];

  nativeCheckInputs = lib.optionals finalAttrs.finalPackage.doCheck [ valgrind ];



  strictDeps = true;

pkgs/desktops/lomiri/development/deviceinfo/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { 
  ];



  cmakeFlags = [

    "-DDISABLE_TESTS=${lib.boolToString (!finalAttrs.doCheck)}"

    "-DDISABLE_TESTS=${lib.boolToString (!finalAttrs.finalPackage.doCheck)}"

  ];



  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;

pkgs/desktops/lomiri/development/geonames/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { 
  ];



  # Tests need to be able to check locale

  LC_ALL = lib.optionalString finalAttrs.doCheck "en_US.UTF-8";

  LC_ALL = lib.optionalString finalAttrs.finalPackage.doCheck "en_US.UTF-8";

  nativeCheckInputs = [

    glibcLocales

  ];
@@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { 
  cmakeFlags = [

    "-DWANT_DOC=${lib.boolToString withDocumentation}"

    "-DWANT_DEMO=${lib.boolToString withExamples}"

    "-DWANT_TESTS=${lib.boolToString finalAttrs.doCheck}"

    "-DWANT_TESTS=${lib.boolToString finalAttrs.finalPackage.doCheck}"

    # Keeps finding & using glib-compile-resources from buildInputs otherwise

    "-DCMAKE_PROGRAM_PATH=${lib.makeBinPath [ buildPackages.glib.dev ]}"

  ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [