JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

treewide: *inputs are lists

Browse Source
This commit is contained in:
Robin Gloster 2019-11-10 00:52:53 +01:00 committed by Jan Tojnar
parent 01e8c64988
commit 760e23136a
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
18 changed files with 45 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/audio/clementine/default.nix
View File

@ -77,7 +77,7 @@ let
inherit src patches nativeBuildInputs postPatch;
# gst_plugins needed for setup-hooks
buildInputs = buildInputs ++ [ makeWrapper gst_plugins ];
buildInputs = buildInputs ++ [ makeWrapper ] ++ gst_plugins;
cmakeFlags = [ "-DUSE_SYSTEM_PROJECTM=ON" ];

2
pkgs/applications/audio/cmus/default.nix
View File

@ -122,7 +122,7 @@ stdenv.mkDerivation rec {
buildInputs = [ ncurses ]
++ stdenv.lib.optional stdenv.cc.isClang clangGCC
++ stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreAudio ]
++ concatMap (a: a.deps) opts;
++ flatten (concatMap (a: a.deps) opts);
makeFlags = [ "LD=$(CC)" ];

2
pkgs/applications/editors/emacs-modes/libgenerated.nix
View File

@ -77,7 +77,7 @@ in {
url = "https://raw.githubusercontent.com/melpa/melpa/${commit}/recipes/${ename}";
inherit sha256;
};
packageRequires = lib.optional (! isNull deps)
packageRequires = lib.optionals (! isNull deps)
(map (dep: pkgargs.${dep} or self.${dep} or null)
deps);
meta = (sourceArgs.meta or {}) // {

2
pkgs/applications/editors/yi/wrapper.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation {
'';
# For hacking purposes
env = yiEnv;
passthru.env = yiEnv;
meta = with stdenv.lib; {
description = "Allows Yi to find libraries and the compiler easily";

14
pkgs/applications/misc/gollum/default.nix
View File

@ -8,15 +8,15 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ];
env = bundlerEnv {
name = "${pname}-${version}-gems";
inherit pname ruby;
gemdir = ./.;
};
phases = [ "installPhase" ];
installPhase = ''
installPhase = let
env = bundlerEnv {
name = "${pname}-${version}-gems";
inherit pname ruby;
gemdir = ./.;
};
in ''
mkdir -p $out/bin
makeWrapper ${env}/bin/gollum $out/bin/gollum \
--prefix PATH ":" ${stdenv.lib.makeBinPath [ git ]}

16
pkgs/applications/networking/instant-messengers/mikutter/default.nix
View File

@ -27,13 +27,6 @@ stdenv.mkDerivation rec {
sha256 = "0nx14vlp7p69m2vw0s6kbiyymsfq0r2jd4nm0v5c4xb9avkpgc8g";
};
env = bundlerEnv {
name = "mikutter-${version}-gems";
gemdir = ./.;
inherit ruby;
};
buildInputs = [ alsaUtils libnotify which gtk2 ruby atk gobject-introspection ];
nativeBuildInputs = [ wrapGAppsHook ];
@ -44,7 +37,14 @@ stdenv.mkDerivation rec {
rm -rf vendor
'';
installPhase = ''
installPhase = let
env = bundlerEnv {
name = "mikutter-${version}-gems";
gemdir = ./.;
inherit ruby;
};
in ''
install -v -D -m644 README $out/share/doc/mikutter/README
install -v -D -m644 LICENSE $out/share/doc/mikutter/LICENSE
rm -v README LICENSE

2
pkgs/desktops/deepin/deepin-icon-theme/default.nix
View File

@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
'';
buildTargets = "all hicolor-links";
installTargets = "install-icons install-cursors";
installTargets = [ "install-icons" "install-cursors" ];
installFlags = [ "PREFIX=${placeholder "out"}" ];
postInstall = ''

3
pkgs/development/compilers/elm/makeDotElm.nix
View File

@ -11,13 +11,10 @@ ver: deps:
inherit (info) sha256;
};
phases = [ "unpackPhase" "installPhase" ];
installPhase = ''
mkdir -p $out
cp -r * $out
'';
};
in ''
mkdir -p .elm/${ver}/packages/${name}

2
pkgs/development/compilers/ghc/8.8.1.nix
View File

@ -73,7 +73,7 @@ let
'';
# Splicer will pull out correct variations
libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
libDeps = platform: stdenv.lib.optional enableTerminfo ncurses
++ [libffi]
++ stdenv.lib.optional (!enableIntegerSimple) gmp
++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;

14
pkgs/development/interpreters/php/default.nix
View File

@ -95,8 +95,8 @@ let
++ optional postgresqlSupport postgresql
++ optional pdo_odbcSupport unixODBC
++ optional pdo_pgsqlSupport postgresql
++ optional pdo_mysqlSupport mysqlBuildInputs
++ optional mysqliSupport mysqlBuildInputs
++ optionals pdo_mysqlSupport mysqlBuildInputs
++ optionals mysqliSupport mysqlBuildInputs
++ optional gmpSupport gmp
++ optional gettextSupport gettext
++ optional intlSupport icu
@ -109,14 +109,14 @@ let
++ optional libzipSupport libzip
++ optional valgrindSupport valgrind;
CXXFLAGS = optional stdenv.cc.isClang "-std=c++11";
CXXFLAGS = optionalString stdenv.cc.isClang "-std=c++11";
configureFlags = [
"--with-config-file-scan-dir=/etc/php.d"
]
++ optional (versionOlder version "7.3") "--with-pcre-regex=${pcre.dev} PCRE_LIBDIR=${pcre}"
++ optional (versions.majorMinor version == "7.3") "--with-pcre-regex=${pcre2.dev} PCRE_LIBDIR=${pcre2}"
++ optional (versionAtLeast version "7.4") "--with-external-pcre=${pcre2.dev} PCRE_LIBDIR=${pcre2}"
++ optionals (versionOlder version "7.3") [ "--with-pcre-regex=${pcre.dev}" "PCRE_LIBDIR=${pcre}" ]
++ optionals (versions.majorMinor version == "7.3") [ "--with-pcre-regex=${pcre2.dev}" "PCRE_LIBDIR=${pcre2}" ]
++ optionals (versionAtLeast version "7.4") [ "--with-external-pcre=${pcre2.dev}" "PCRE_LIBDIR=${pcre2}" ]
++ optional stdenv.isDarwin "--with-iconv=${libiconv}"
++ optional withSystemd "--with-fpm-systemd"
++ optionals imapSupport [
@ -129,7 +129,7 @@ let
"LDAP_INCDIR=${openldap.dev}/include"
"LDAP_LIBDIR=${openldap.out}/lib"
]
++ optional (ldapSupport && stdenv.isLinux) "--with-ldap-sasl=${cyrus_sasl.dev}"
++ optional (ldapSupport && stdenv.isLinux) "--with-ldap-sasl=${cyrus_sasl.dev}"
++ optional apxs2Support "--with-apxs2=${apacheHttpd.dev}/bin/apxs"
++ optional embedSupport "--enable-embed"
++ optional mhashSupport "--with-mhash"

4
pkgs/development/libraries/java/swt/default.nix
View File

@ -38,8 +38,8 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ unzip pkgconfig ];
buildInputs = [ jdk gtk2 libXt libXtst libXi libGLU libGL webkitgtk libsoup ];
NIX_LFLAGS = (map (x: "-L${lib.getLib x}/lib") [ xorg.libX11 pango gdk-pixbuf glib ]) ++
[ "-lX11" "-lpango-1.0" "-lgdk_pixbuf-2.0" "-lglib-2.0" ];
NIX_LFLAGS = toString (map (x: "-L${lib.getLib x}/lib") [ xorg.libX11 pango gdk-pixbuf glib ]) +
" -lX11 -lpango-1.0 -lgdk_pixbuf-2.0 -lglib-2.0";
buildPhase = ''
unzip src.zip -d src

2
pkgs/development/mobile/androidenv/build-tools.nix
View File

@ -3,7 +3,7 @@
deployAndroidPackage {
inherit package os;
buildInputs = [ autoPatchelfHook makeWrapper ] ++
lib.optional (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 pkgs_i686.glibc pkgs_i686.zlib pkgs_i686.ncurses5 ];
lib.optionals (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 pkgs_i686.glibc pkgs_i686.zlib pkgs_i686.ncurses5 ];
patchInstructions = ''
${lib.optionalString (os == "linux") ''
addAutoPatchelfSearchPath $packageBaseDir/lib

2
pkgs/development/mobile/androidenv/platform-tools.nix
View File

@ -3,7 +3,7 @@
deployAndroidPackage {
inherit package os;
buildInputs = [ autoPatchelfHook ]
++ lib.optional (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 ];
++ lib.optionals (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 ];
patchInstructions = lib.optionalString (os == "linux") ''
addAutoPatchelfSearchPath $packageBaseDir/lib64
autoPatchelf --no-recurse $packageBaseDir/lib64

5
pkgs/development/python-modules/buildbot/default.nix
View File

@ -44,10 +44,9 @@ let
autobahn
pyjwt
pyyaml
]
# tls
twisted.extras.tls
];
++ twisted.extras.tls;
checkInputs = [
treq

4
pkgs/development/python-modules/treq/default.nix
View File

@ -17,9 +17,9 @@ buildPythonPackage rec {
incremental
service-identity
twisted
]
# twisted [tls] requirements (we should find a way to list "extras")
twisted.extras.tls
];
++ twisted.extras.tls;
checkInputs = [
pep8

2
pkgs/os-specific/linux/brillo/default.nix
View File

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
makeFlags = [ "PREFIX=$(out)" "AADIR=$(out)/etc/apparmor.d" ];
installTargets = "install-dist";
installTargets = [ "install-dist" ];
meta = with stdenv.lib; {
description = "Backlight and Keyboard LED control tool";

5
pkgs/servers/http/apache-httpd/2.4.nix
View File

@ -44,10 +44,6 @@ stdenv.mkDerivation rec {
# Required for ‘pthread_cancel’.
NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
preConfigure = ''
configureFlags="$configureFlags --includedir=$dev/include"
'';
configureFlags = [
"--with-apr=${apr.dev}"
"--with-apr-util=${aprutil.dev}"
@ -60,6 +56,7 @@ stdenv.mkDerivation rec {
"--enable-cern-meta"
"--enable-imagemap"
"--enable-cgi"
"--includedir=${placeholder "dev"}/include"
(stdenv.lib.enableFeature proxySupport "proxy")
(stdenv.lib.enableFeature sslSupport "ssl")
(stdenv.lib.withFeatureAs libxml2Support "libxml2" "${libxml2.dev}/include/libxml2")

14
pkgs/tools/admin/fastlane/default.nix
View File

@ -6,15 +6,15 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ];
env = bundlerEnv {
name = "${pname}-${version}-gems";
inherit pname ruby;
gemdir = ./.;
};
phases = [ "installPhase" ];
installPhase = ''
installPhase = let
env = bundlerEnv {
name = "${pname}-${version}-gems";
inherit pname ruby;
gemdir = ./.;
};
in ''
mkdir -p $out/bin
makeWrapper ${env}/bin/fastlane $out/bin/fastlane \
--set FASTLANE_SKIP_UPDATE_CHECK 1