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: 5b3507b4e703
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a23bf67c2af6
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 4, 2019

  1. mapnik: Fix build

    @knedlsepp
    knedlsepp committed Mar 4, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e844f08 View commit details

Commits on Mar 5, 2019

  1. Merge pull request #56845 from knedlsepp/fix-mapnik 

    mapnik: Fix build
    @markuskowa
    markuskowa authored Mar 5, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a23bf67 View commit details
Showing with 4 additions and 0 deletions.
  1. +4 −0 pkgs/development/libraries/mapnik/default.nix
4 changes: 4 additions & 0 deletions pkgs/development/libraries/mapnik/default.nix
View file
Original file line number Diff line number Diff line change
@@ -31,6 +31,10 @@ stdenv.mkDerivation rec {

prefixKey = "PREFIX=";

preConfigure = ''
patchShebangs ./configure
'';

configureFlags = [
"BOOST_INCLUDES=${boost.dev}/include"
"BOOST_LIBS=${boost.out}/lib"