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: b7347338e272
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8cef6ec5fe51
Choose a head ref
  • 4 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 18, 2019

  1. ffado: prevent build tools from leaking into closure 

    FFADO stored paths to various build dependencies and libraries
like gcc or pyuic5 (from PyQT) in $out/lib/libffado/static_info.txt,
thus  bringing them into the runtime closure.

With Nix, this information is not really critical, as we can find
out the exact dependencies from .drv files in Nix store.

This alone reduced the closure size from 914866184B to 132341176B.
    @jtojnar
    jtojnar committed Jun 18, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    eliottness Eliott Bouhana
    GPG key ID: 5C4DC5A45005B771
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e40d568 View commit details

  2. libxmlxx3: split out dev output

    @jtojnar
    jtojnar committed Jun 18, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8e7cea5 View commit details

  3. libxmlxx3: split out doc output

    @jtojnar
    jtojnar committed Jun 18, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cf41cb2 View commit details

  4. ffado: prevent build tools from leaking into closure (#63393) 

    ffado: prevent build tools from leaking into closure
    @jtojnar
    jtojnar authored Jun 18, 2019
    Copy the full SHA
    8cef6ec View commit details
Showing with 14 additions and 5 deletions.
  1. +9 −5 pkgs/development/libraries/libxmlxx/v3.nix
  2. +5 −0 pkgs/os-specific/linux/ffado/default.nix
14 changes: 9 additions & 5 deletions pkgs/development/libraries/libxmlxx/v3.nix
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,27 @@
{ stdenv, fetchurl, pkgconfig, libxml2, glibmm, perl }:

stdenv.mkDerivation rec {
name = "libxml++-${maj_ver}.${min_ver}";
maj_ver = "3.0";
min_ver = "1";
pname = "libxml++";
version = "3.0.1";

src = fetchurl {
url = "mirror://gnome/sources/libxml++/${maj_ver}/${name}.tar.xz";
url = "mirror://gnome/sources/libxml++/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "19kik79fmg61nv0by0a5f9wchrcfjwzvih4v2waw01hqflhqvp0r";
};

outputs = [ "out" "devdoc" ];
outputs = [ "out" "dev" "doc" "devdoc" ];

nativeBuildInputs = [ pkgconfig perl ];

buildInputs = [ glibmm ];

propagatedBuildInputs = [ libxml2 ];

postFixup = ''
substituteInPlace $dev/lib/pkgconfig/libxml++-3.0.pc \
--replace 'docdir=''${datarootdir}' "docdir=$doc/share"
'';

meta = with stdenv.lib; {
homepage = http://libxmlplusplus.sourceforge.net/;
description = "C++ wrapper for the libxml2 XML parser library, version 3";
5 changes: 5 additions & 0 deletions pkgs/os-specific/linux/ffado/default.nix
View file
Original file line number Diff line number Diff line change
@@ -53,6 +53,11 @@ in stdenv.mkDerivation rec {

enableParallelBuilding = true;

postInstall = ''
# prevent build tools from leaking into closure
echo 'See `nix-store --query --tree ${placeholder "out"}`.' > $out/lib/libffado/static_info.txt
'';

meta = with stdenv.lib; {
homepage = http://www.ffado.org;
description = "FireWire audio drivers";