treewide: remove unzip where not needed
This commit is contained in:
committed by
Jonathan Ringer
parent
75c67d6be9
commit
c5a669d3f7
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, unzip, libjpeg, libtiff, zlib
|
||||
{ lib, stdenv, fetchurl, libjpeg, libtiff, zlib
|
||||
, postgresql, libmysqlclient, libgeotiff, python2Packages, proj, geos, openssl
|
||||
, libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat
|
||||
, libiconv, libxml2
|
||||
@@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1n6w0m2603q9cldlz0wyscp75ci561dipc36jqbf3mjmylybv0x3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
buildInputs = [ libjpeg libtiff libgeotiff libpng proj openssl sqlite
|
||||
libspatialite poppler hdf4 qhull giflib expat libxml2 proj ]
|
||||
++ (with python2Packages; [ python numpy wrapPython ])
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{ lib, mkDerivation, unzip, fetchFromGitHub, qmake, qtmultimedia, qtbase }:
|
||||
{ lib, mkDerivation, fetchFromGitHub, qmake, qtmultimedia, qtbase }:
|
||||
|
||||
mkDerivation rec {
|
||||
version = "unstable-20-06-26";
|
||||
pname = "herqq";
|
||||
|
||||
nativeBuildInputs = [ qmake unzip ];
|
||||
nativeBuildInputs = [ qmake ];
|
||||
buildInputs = [ qtbase qtmultimedia ];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchzip, libGLU, libGL, unzip, libXrandr, libX11, libXxf86vm }:
|
||||
{ lib, stdenv, fetchzip, libGLU, libGL, libXrandr, libX11, libXxf86vm }:
|
||||
|
||||
let
|
||||
common = import ./common.nix { inherit fetchzip; };
|
||||
@@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
|
||||
mkdir -p $out/lib
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
buildInputs = [ libGLU libGL libXrandr libX11 libXxf86vm ];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchzip, libGLU, libGL, unzip, fetchFromGitHub, cmake, Cocoa, OpenGL, IOKit }:
|
||||
{ lib, stdenv, fetchzip, libGLU, libGL, fetchFromGitHub, cmake, Cocoa, OpenGL, IOKit }:
|
||||
|
||||
let
|
||||
common = import ./common.nix { inherit fetchzip; };
|
||||
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||
"-DIRRLICHT_BUILD_TOOLS=OFF"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake unzip ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ OpenGL Cocoa IOKit ];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, libX11, unzip, cmake, ois, freetype, libuuid,
|
||||
{ lib, stdenv, fetchFromGitHub, libX11, cmake, ois, freetype, libuuid,
|
||||
boost, pkg-config, withOgre ? false, ogre ? null, libGL, libGLU ? null } :
|
||||
|
||||
let
|
||||
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
|
||||
sha256 = "0a4zi8w18pjj813n7kmxldl1d9r1jp0iyhkw7pbqgl8f7qaq994w";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config unzip ];
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ libX11 ois freetype libuuid boost ]
|
||||
++ (if withOgre then [ ogre ] else [ libGL libGLU ]);
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, unzip, re2, openfx, zlib, ilmbase, libGLU, libGL, openexr }:
|
||||
{ lib, stdenv, fetchFromGitHub, re2, openfx, zlib, ilmbase, libGLU, libGL, openexr }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "openexrid-unstable";
|
||||
@@ -25,7 +25,6 @@ stdenv.mkDerivation {
|
||||
-I${openfx.dev}/include/OpenFX
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
buildInputs = [ re2 openfx zlib ilmbase libGLU libGL openexr ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, unzip }:
|
||||
{ lib, stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "openfx";
|
||||
@@ -11,8 +11,6 @@ stdenv.mkDerivation {
|
||||
sha256 = "0k9ggzr6bisn77mipjfvawg3mv4bz50b63v8f7w1jhldi1sfy548";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
outputs = [ "dev" "out" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, unzip, openexr, boost, jemalloc, c-blosc, ilmbase, tbb }:
|
||||
{ lib, stdenv, fetchFromGitHub, openexr, boost, jemalloc, c-blosc, ilmbase, tbb }:
|
||||
|
||||
stdenv.mkDerivation rec
|
||||
{
|
||||
@@ -14,7 +14,6 @@ stdenv.mkDerivation rec
|
||||
|
||||
outputs = [ "out" ];
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
buildInputs = [ openexr boost tbb jemalloc c-blosc ilmbase ];
|
||||
|
||||
setSourceRoot = ''
|
||||
|
||||
Reference in New Issue
Block a user