ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-14 05:37:40 +03:00
Code Issues Projects Releases Wiki Activity

treewide: remove references to pruneLibtoolFiles, now included by default

Browse Source
This commit is contained in:
Piotr Bogdan 2018-12-09 22:55:10 +00:00
parent 743d03bafc
commit d121dd5222
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/digitalbitbox/default.nix
View File

@ -68,8 +68,6 @@ in stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
# TODO: remove libcap when pruneLibtoolFiles applies to pulseaudio.
libcap
libevent libevent
libtool libtool
udev udev

4
pkgs/development/libraries/SDL2/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, config, libGLSupported, fetchurl, pkgconfig, pruneLibtoolFiles { stdenv, config, libGLSupported, fetchurl, pkgconfig
, openglSupport ? libGLSupported, libGL , openglSupport ? libGLSupported, libGL
, alsaSupport ? stdenv.isLinux, alsaLib , alsaSupport ? stdenv.isLinux, alsaLib
, x11Support ? !stdenv.isCygwin, libX11, xproto, libICE, libXi, libXScrnSaver, libXcursor, libXinerama, libXext, libXxf86vm, libXrandr , x11Support ? !stdenv.isCygwin, libX11, xproto, libICE, libXi, libXScrnSaver, libXcursor, libXinerama, libXext, libXxf86vm, libXrandr
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
patches = [ ./find-headers.patch ]; patches = [ ./find-headers.patch ];
nativeBuildInputs = [ pkgconfig pruneLibtoolFiles ]; nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = dlopenPropagatedBuildInputs; propagatedBuildInputs = dlopenPropagatedBuildInputs;

4
pkgs/development/libraries/libheif/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, pruneLibtoolFiles, libde265, x265, libpng, libjpeg }: { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libde265, x265, libpng, libjpeg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.3.2"; version = "1.3.2";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0hk8mzig2kp5f94j4jwqxzjrm7ffk16ffvxl92rf0afsh6vgnz7w"; sha256 = "0hk8mzig2kp5f94j4jwqxzjrm7ffk16ffvxl92rf0afsh6vgnz7w";
}; };
nativeBuildInputs = [ autoreconfHook pkgconfig pruneLibtoolFiles ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ libde265 x265 libpng libjpeg ]; buildInputs = [ libde265 x265 libpng libjpeg ];
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/development/libraries/webkitgtk/2.4.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, perl, python, ruby, bison, gperf, flex { stdenv, fetchurl, fetchpatch, perl, python, ruby, bison, gperf, flex
, pkgconfig, which, gettext, gobject-introspection, pruneLibtoolFiles , pkgconfig, which, gettext, gobject-introspection
, gtk2, gtk3, wayland, libwebp, enchant, sqlite , gtk2, gtk3, wayland, libwebp, enchant, sqlite
, libxml2, libsoup, libsecret, libxslt, harfbuzz, xorg , libxml2, libsoup, libsecret, libxslt, harfbuzz, xorg
, gst-plugins-base, libobjc , gst-plugins-base, libobjc
@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
perl python ruby bison gperf flex perl python ruby bison gperf flex
pkgconfig which gettext gobject-introspection pruneLibtoolFiles pkgconfig which gettext gobject-introspection
]; ];
buildInputs = [ buildInputs = [