Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6dbb6a380ba7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d0384cc7b8f2
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 25, 2018

  1. glib: propagate gettext/iconv

    @matthewbauer
    matthewbauer authored Mar 25, 2018
    2
    Copy the full SHA
    d0384cc View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/development/libraries/glib/default.nix
6 changes: 3 additions & 3 deletions pkgs/development/libraries/glib/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, hostPlatform, fetchurl, pkgconfig, gettext, perl, python
{ stdenv, hostPlatform, fetchurl, pkgconfig, perl, python
, libiconv, libintl, zlib, libffi, pcre, libelf, gnome3
# use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib)
, utillinuxMinimal ? null
@@ -66,9 +66,9 @@ stdenv.mkDerivation rec {
++ optionals stdenv.isLinux [ utillinuxMinimal ] # for libmount
++ optionals doCheck [ tzdata libxml2 desktop-file-utils shared-mime-info ];

nativeBuildInputs = [ pkgconfig gettext perl python libintl libiconv ];
nativeBuildInputs = [ pkgconfig perl python ];

propagatedBuildInputs = [ zlib libffi ];
propagatedBuildInputs = [ zlib libffi gettext libiconv ];

# internal pcre would only add <200kB, but it's relatively common
configureFlags = [ "--with-pcre=system" ]