diff --git a/pkgs/applications/emulators/duckstation/default.nix b/pkgs/applications/emulators/duckstation/default.nix index 7e7bfd494600..91d2b23705ad 100644 --- a/pkgs/applications/emulators/duckstation/default.nix +++ b/pkgs/applications/emulators/duckstation/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , SDL2 , cmake -, copyDesktopItems , cubeb , curl , extra-cmake-modules @@ -48,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - copyDesktopItems extra-cmake-modules ninja pkg-config diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 9b0656ac720f..f6223fecd56d 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -548,6 +548,7 @@ let clustermq = [ pkgs.pkg-config ]; coga = [ pkgs.gsl.dev ]; deepSNV = with pkgs; [ xz.dev bzip2.dev zlib.dev ]; + epialleleR = with pkgs; [ xz.dev bzip2.dev zlib.dev ]; gpg = [ pkgs.gpgme ]; webp = [ pkgs.libwebp ]; RMark = [ pkgs.which ]; @@ -999,6 +1000,7 @@ let "muscData" "org_Mxanthus_db" "scpdata" + "signatureSearch" "nullrangesData" ]; diff --git a/pkgs/games/ecwolf/default.nix b/pkgs/games/ecwolf/default.nix index 08b24deee0d4..8bbbc53a0dcd 100644 --- a/pkgs/games/ecwolf/default.nix +++ b/pkgs/games/ecwolf/default.nix @@ -2,7 +2,6 @@ , lib , fetchFromBitbucket , cmake -, copyDesktopItems , pkg-config , makeWrapper , zlib @@ -25,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "V2pSP8i20zB50WtUMujzij+ISSupdQQ/oCYYrOaTU1g="; }; - nativeBuildInputs = [ cmake copyDesktopItems pkg-config ] + nativeBuildInputs = [ cmake pkg-config ] ++ lib.optionals stdenv.isDarwin [ makeWrapper ]; buildInputs = [ zlib bzip2 libjpeg SDL2 SDL2_net SDL2_mixer gtk3 ]; diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index bcb2ca249ddf..a61f3e1ae4d0 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -189,7 +189,7 @@ let Alternatively you can configure a predicate to allow specific packages: { nixpkgs.config.${predicateConfigAttr} = pkg: builtins.elem (lib.getName pkg) [ - "${getName attrs}" + "${lib.getName attrs}" ]; } ''; diff --git a/pkgs/tools/misc/valeronoi/default.nix b/pkgs/tools/misc/valeronoi/default.nix index 9826ce510bfc..b27fe3e499a3 100644 --- a/pkgs/tools/misc/valeronoi/default.nix +++ b/pkgs/tools/misc/valeronoi/default.nix @@ -4,7 +4,6 @@ , boost , cgal , cmake -, copyDesktopItems , gpp , mpfr , qtbase @@ -36,7 +35,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - copyDesktopItems wrapQtAppsHook ];