Unverified Commit 63cc38bf authored by Someone's avatar Someone Committed by GitHub
Browse files

Merge pull request #324545 from paparodeo/treewide-strict-deps-fixes 

treewide: fix packages that use cmake strict deps when cmake strict deps works
parents 08e37800 72a4d2a2

pkgs/applications/graphics/panotools/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { 


  nativeBuildInputs = [

    cmake

    perl

  ];



  buildInputs = [

    libjpeg

    libpng

    libtiff

    perl

  ] ++ lib.optionals stdenv.isDarwin [

    darwin.apple_sdk.frameworks.Carbon

  ];

pkgs/applications/misc/pwsafe/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ stdenv.mkDerivation rec { 
    gettext

    perl

    pkg-config

    wxGTK32

    zip

  ];

pkgs/applications/networking/ids/zeek/broker/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec { 
    substituteInPlace bindings/python/CMakeLists.txt --replace " -u -r" ""

  '';



  nativeBuildInputs = [ cmake ];

  nativeBuildInputs = [ cmake python3 ];

  buildInputs = [ openssl python3.pkgs.pybind11 ];

  propagatedBuildInputs = [ caf' ];

pkgs/applications/networking/ids/zeek/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ stdenv.mkDerivation rec { 
    file

    flex

    python

    swig

  ];



  buildInputs = [
@@ -55,7 +56,6 @@ stdenv.mkDerivation rec { 
    libpcap

    ncurses

    openssl

    swig

    zlib

    python

  ] ++ lib.optionals stdenv.isLinux [

pkgs/applications/science/electronics/flopoco/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -54,12 +54,12 @@ stdenv.mkDerivation rec { 
  nativeBuildInputs = [

    bison

    cmake

    flex

    installShellFiles

  ];



  buildInputs = [

    boost

    flex

    gmp

    libxml2

    mpfi