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

ghc, go, guile: Use new pkgs*

Browse Source 
`pkgsBuildTarget` allows us to avoid repeated and confusing conditions.
The others merely provide clarity for one the foreign package set's
target platform matters.
This commit is contained in:
John Ericson
2019-03-13 17:03:53 -04:00
committed by John Ericson
parent 70d71bbbe4
commit 655a29ff9c
9 changed files with 34 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/interpreters/guile/1.8.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, buildPackages
{ stdenv, pkgsBuildBuild, buildPackages
, fetchurl, makeWrapper, gawk, pkgconfig
, libtool, readline, gmp
}:
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ]
++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
buildPackages.buildPackages.guile_1_8;
pkgsBuildBuild.guile_1_8;
nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
buildInputs = [ readline libtool ];

4
pkgs/development/interpreters/guile/2.0.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, buildPackages
{ stdenv, pkgsBuildBuild, buildPackages
, fetchpatch, fetchurl, makeWrapper, gawk, pkgconfig
, libffi, libtool, readline, gmp, boehmgc, libunistring
, coverageAnalysis ? null
@@ -22,7 +22,7 @@
depsBuildBuild = [ buildPackages.stdenv.cc ]
++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
buildPackages.buildPackages.guile_2_0;
pkgsBuildBuild.guile_2_0;
nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
buildInputs = [ readline libtool libunistring libffi ];

4
pkgs/development/interpreters/guile/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, buildPackages
{ stdenv, pkgsBuildBuild, buildPackages
, fetchurl, makeWrapper, gawk, pkgconfig
, libffi, libtool, readline, gmp, boehmgc, libunistring
, coverageAnalysis ? null
@@ -23,7 +23,7 @@
depsBuildBuild = [ buildPackages.stdenv.cc ]
++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
buildPackages.buildPackages.guile;
pkgsBuildBuild.guile;
nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
buildInputs = [ readline libtool libunistring libffi ];