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: 7dea73944a5d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 58e31b269243
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on Mar 4, 2019

  1. pugixml: use fetchFromGitHub 

    (cherry picked from commit 8571a66)
    @jokogr @tokudan
    jokogr authored and tokudan committed Mar 4, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    primeos Michael Weiss
    GPG key ID: 5BE487C4D4771D83
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f06205d View commit details

  2. pugixml: fix pkg-config file installation 

    (cherry picked from commit 236c7db)
    @jokogr @tokudan
    jokogr authored and tokudan committed Mar 4, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    54cc54e View commit details

Commits on Mar 5, 2019

  1. Merge pull request #56832 from tokudan/r1903-filezilla-zhf 

    pugixml: Fix pkg-config file installation and use fetchFromGitHub [19.03]
    @jokogr
    jokogr authored Mar 5, 2019
    Copy the full SHA
    58e31b2 View commit details
Showing with 15 additions and 5 deletions.
  1. +15 −5 pkgs/development/libraries/pugixml/default.nix
20 changes: 15 additions & 5 deletions pkgs/development/libraries/pugixml/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,27 @@
{ stdenv, fetchurl, cmake, shared ? false }:
{ stdenv, fetchFromGitHub, fetchpatch, cmake, shared ? false }:

stdenv.mkDerivation rec {
name = "pugixml-${version}";
version = "1.9";

src = fetchurl {
url = "https://github.com/zeux/pugixml/releases/download/v${version}/${name}.tar.gz";
sha256 = "19nv3zhik3djp4blc4vrjwrl8dfhzmal8b21sq7y907nhddx6mni";
src = fetchFromGitHub {
owner = "zeux";
repo = "pugixml";
rev = "v${version}";
sha256 = "0iraznwm78pyyzc9snvd3dyz8gddvmxsm1b3kpw7wixkvcawdviv";
};

patches = [
# To be removed after a version newer than 1.9 is released
(fetchpatch {
url = "https://github.com/zeux/pugixml/pull/193.patch";
sha256 = "0s4anqlr2ppfibxyl29nrqbcprrg89k7il6303dm91s6620ydmka";
})
];

nativeBuildInputs = [ cmake ];

cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if shared then "ON" else "OFF"} -DBUILD_PKGCONFIG=ON" ];
cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if shared then "ON" else "OFF"}" ];

preConfigure = ''
# Enable long long support (required for filezilla)