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

Commits on Apr 17, 2020

  1. ipe: fix Qt wrapping 

    Uses mkDerivation instead of stdenv.mkDerivation, to fix Qt wrapping problem.
    @cgevans
    cgevans authored and Jon committed Apr 17, 2020
    Copy the full SHA
    9192934 View commit details
Showing with 4 additions and 8 deletions.
  1. +4 −8 pkgs/applications/graphics/ipe/default.nix
12 changes: 4 additions & 8 deletions pkgs/applications/graphics/ipe/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ stdenv, fetchurl, makeWrapper, pkgconfig, zlib, freetype, cairo, lua5, texlive, ghostscript
, libjpeg, libpng, qtbase
, libjpeg, libpng, qtbase, mkDerivation
}:

stdenv.mkDerivation rec {
mkDerivation rec {
name = "ipe-7.2.13";

src = fetchurl {
@@ -20,13 +20,9 @@ stdenv.mkDerivation rec {
libjpeg libpng zlib qtbase freetype cairo lua5 texlive ghostscript
];

nativeBuildInputs = [ makeWrapper pkgconfig ];
nativeBuildInputs = [ pkgconfig ];

postFixup = ''
for prog in $out/bin/*; do
wrapProgram "$prog" --prefix PATH : "${texlive}/bin"
done
'';
qtWrapperArgs = [ ''--prefix PATH : ${texlive}/bin'' ];

enableParallelBuilding = true;