mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 07:23:20 +00:00
Merge pull request #303705 from Aleksanaa/not-copy-desktop-items
treewide: remove unused copyDesktopItems from some packages
This commit is contained in:
commit
ddfd6f48dc
@ -3,7 +3,6 @@
|
|||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, SDL2
|
, SDL2
|
||||||
, cmake
|
, cmake
|
||||||
, copyDesktopItems
|
|
||||||
, cubeb
|
, cubeb
|
||||||
, curl
|
, curl
|
||||||
, extra-cmake-modules
|
, extra-cmake-modules
|
||||||
@ -48,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
copyDesktopItems
|
|
||||||
extra-cmake-modules
|
extra-cmake-modules
|
||||||
ninja
|
ninja
|
||||||
pkg-config
|
pkg-config
|
||||||
|
@ -2,7 +2,6 @@
|
|||||||
, lib
|
, lib
|
||||||
, fetchFromBitbucket
|
, fetchFromBitbucket
|
||||||
, cmake
|
, cmake
|
||||||
, copyDesktopItems
|
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
, zlib
|
, zlib
|
||||||
@ -25,7 +24,7 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "V2pSP8i20zB50WtUMujzij+ISSupdQQ/oCYYrOaTU1g=";
|
sha256 = "V2pSP8i20zB50WtUMujzij+ISSupdQQ/oCYYrOaTU1g=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake copyDesktopItems pkg-config ]
|
nativeBuildInputs = [ cmake pkg-config ]
|
||||||
++ lib.optionals stdenv.isDarwin [ makeWrapper ];
|
++ lib.optionals stdenv.isDarwin [ makeWrapper ];
|
||||||
buildInputs = [ zlib bzip2 libjpeg SDL2 SDL2_net SDL2_mixer gtk3 ];
|
buildInputs = [ zlib bzip2 libjpeg SDL2 SDL2_net SDL2_mixer gtk3 ];
|
||||||
|
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
, boost
|
, boost
|
||||||
, cgal
|
, cgal
|
||||||
, cmake
|
, cmake
|
||||||
, copyDesktopItems
|
|
||||||
, gpp
|
, gpp
|
||||||
, mpfr
|
, mpfr
|
||||||
, qtbase
|
, qtbase
|
||||||
@ -36,7 +35,6 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
copyDesktopItems
|
|
||||||
wrapQtAppsHook
|
wrapQtAppsHook
|
||||||
];
|
];
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user