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

Commits on Feb 4, 2019

  1. ipe: 7.2.9 -> 7.2.10 

    https://mailman.science.uu.nl/pipermail/ipe-announce/2019-February/000077.html

Cleanup a bit while visiting :).
    @dtzWill
    dtzWill committed Feb 4, 2019
    Copy the full SHA
    f1fda2e View commit details

Commits on Feb 12, 2019

  1. Merge pull request #55214 from dtzWill/update/ipe-7.2.10 

    ipe: 7.2.9 -> 7.2.10
    @dtzWill
    dtzWill authored Feb 12, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    91c7157 View commit details
Showing with 6 additions and 14 deletions.
  1. +6 −14 pkgs/applications/graphics/ipe/default.nix
20 changes: 6 additions & 14 deletions pkgs/applications/graphics/ipe/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,26 +3,16 @@
}:

stdenv.mkDerivation rec {
name = "ipe-7.2.9";
name = "ipe-7.2.10";

src = fetchurl {
url = "https://dl.bintray.com/otfried/generic/ipe/7.2/${name}-src.tar.gz";
sha256 = "1i0h0q32xvbb0d3y2ff76jxnaw05hjf2z5gzww886z8arxwar1xn";
sha256 = "0rm31kvyg30452bz12yi49bkhdmi4bjdx6zann5cdlbi0pvmx7xh";
};

# changes taken from Gentoo portage
preConfigure = ''
cd src
sed -i \
-e 's/fpic/fPIC/' \
-e 's/moc-qt4/moc/' \
config.mak || die
sed -i -e 's/install -s/install/' common.mak || die
'';

NIX_CFLAGS_COMPILE = [ "-std=c++11" ]; # build with Qt 5.7
sourceRoot = "${name}/src";

IPEPREFIX="$$out";
IPEPREFIX="${placeholder "out"}";
URWFONTDIR="${texlive}/texmf-dist/fonts/type1/urw/";
LUA_PACKAGE = "lua";

@@ -38,6 +28,8 @@ stdenv.mkDerivation rec {
done
'';

enableParallelBuilding = true;

#TODO: make .desktop entry

meta = {