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

Commits on May 29, 2018

  1. inkscape: fix build

    @7c6f434c
    7c6f434c committed May 29, 2018
    Copy the full SHA
    11bf5db View commit details
Showing with 4 additions and 0 deletions.
  1. +3 −0 pkgs/applications/graphics/inkscape/default.nix
  2. +1 −0 pkgs/top-level/all-packages.nix
3 changes: 3 additions & 0 deletions pkgs/applications/graphics/inkscape/default.nix
View file
Original file line number Diff line number Diff line change
@@ -64,6 +64,9 @@ stdenv.mkDerivation rec {
rm "$out/share/icons/hicolor/icon-theme.cache"
'';

# 0.92.3 complains about an invalid conversion from const char * to char *
NIX_CFLAGS_COMPILE = " -fpermissive ";

meta = with lib; {
license = "GPL";
homepage = https://www.inkscape.org;
1 change: 1 addition & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -16413,6 +16413,7 @@ with pkgs;

inkscape = callPackage ../applications/graphics/inkscape {
lcms = lcms2;
poppler = poppler_0_61;
};

inspectrum = libsForQt5.callPackage ../applications/misc/inspectrum { };