b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #166507 from siraben/stdenv-buildinputs

Browse source
This commit is contained in:
Ben Siraphob 2022-03-31 12:03:42 -05:00 committed by GitHub
parent 60554e4686 61776f460f
commit 9069d6a30d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/applications/editors/vim/plugins/overrides.nix
View file

@ -175,7 +175,6 @@ self: super: {
cpsm = super.cpsm.overrideAttrs (old: { cpsm = super.cpsm.overrideAttrs (old: {
buildInputs = [ buildInputs = [
python3 python3
stdenv
cmake cmake
boost boost
icu icu

2
pkgs/applications/graphics/exrtools/default.nix
View file

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ stdenv openexr libpng12 libjpeg ]; buildInputs = [ openexr libpng12 libjpeg ];
meta = with lib; { meta = with lib; {
description = "Collection of utilities for manipulating OpenEXR images"; description = "Collection of utilities for manipulating OpenEXR images";

2
pkgs/applications/misc/gtk2fontsel/default.nix
View file

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ stdenv gtk2 ]; buildInputs = [ gtk2 ];
preferLocalBuild = true; preferLocalBuild = true;

2
pkgs/applications/misc/stag/default.nix
View file

@ -11,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "1yrzjhcwrxrxq5jj695wvpgb0pz047m88yq5n5ymkcw5qr78fy1v"; sha256 = "1yrzjhcwrxrxq5jj695wvpgb0pz047m88yq5n5ymkcw5qr78fy1v";
}; };
buildInputs = [ stdenv curses ]; buildInputs = [ curses ];
installPhase = '' installPhase = ''
make install PREFIX=$out make install PREFIX=$out

2
pkgs/applications/misc/yubioath-desktop/default.nix
View file

@ -15,7 +15,7 @@ mkDerivation rec {
doCheck = false; doCheck = false;
buildInputs = [ stdenv qtbase qtquickcontrols2 qtgraphicaleffects python3 ]; buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects python3 ];
nativeBuildInputs = [ qmake makeWrapper python3.pkgs.wrapPython ]; nativeBuildInputs = [ qmake makeWrapper python3.pkgs.wrapPython ];

2
pkgs/development/compilers/aliceml/default.nix
View file

@ -18,7 +18,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ autoconf automake ]; nativeBuildInputs = [ autoconf automake ];
buildInputs = [ buildInputs = [
stdenv gcc glibc gcc glibc
libtool gnumake libtool gnumake
file which zsh m4 gtk2 zlib gmp file which zsh m4 gtk2 zlib gmp
gnome2.libgnomecanvas pango sqlite gnome2.libgnomecanvas pango sqlite

2
pkgs/development/lisp-modules/shell.nix
View file

@ -5,7 +5,7 @@ self = rec {
name = "ql-to-nix"; name = "ql-to-nix";
env = buildEnv { name = name; paths = buildInputs; }; env = buildEnv { name = name; paths = buildInputs; };
buildInputs = [ buildInputs = [
gcc stdenv gcc
openssl fuse libuv libmysqlclient libfixposix libev sqlite openssl fuse libuv libmysqlclient libfixposix libev sqlite
freetds freetds
lispPackages.quicklisp-to-nix lispPackages.quicklisp-to-nix-system-info lispPackages.quicklisp-to-nix lispPackages.quicklisp-to-nix-system-info

2
pkgs/tools/filesystems/grive2/default.nix
View file

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ libgcrypt yajl curl expat stdenv boost libiberty ]; buildInputs = [ libgcrypt yajl curl expat boost libiberty ];
meta = with lib; { meta = with lib; {
description = "A console Google Drive client"; description = "A console Google Drive client";

2
pkgs/tools/misc/statserial/default.nix
View file

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
--replace 'LDFLAGS = -s -N' '#LDFLAGS = -s -N' --replace 'LDFLAGS = -s -N' '#LDFLAGS = -s -N'
''; '';
buildInputs = [ ncurses glibc stdenv ]; buildInputs = [ ncurses glibc ];
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin

2
pkgs/tools/virtualization/xe-guest-utilities/default.nix
View file

@ -14,7 +14,7 @@ stdenv.mkDerivation (rec {
url = "https://sources.archlinux.org/other/community/xe-guest-utilities/xe-guest-utilities_${version}-1120.tar.gz"; url = "https://sources.archlinux.org/other/community/xe-guest-utilities/xe-guest-utilities_${version}-1120.tar.gz";
sha256 = "f9593cd9588188f80253e736f48d8dd94c5b517abb18316085f86acffab48794"; sha256 = "f9593cd9588188f80253e736f48d8dd94c5b517abb18316085f86acffab48794";
}; };
buildInputs = [ bzip2 gnutar gnused python2 lzo zlib xz stdenv gnugrep which ]; buildInputs = [ bzip2 gnutar gnused python2 lzo zlib xz gnugrep which ];
patches = [ ./ip-address.patch ]; patches = [ ./ip-address.patch ];
postPatch = '' postPatch = ''
tar xf "$NIX_BUILD_TOP/$name/xenstore-sources.tar.bz2" tar xf "$NIX_BUILD_TOP/$name/xenstore-sources.tar.bz2"