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

Commits on Oct 4, 2019

  1. openscad: remove useless preBuild phase 

    The preBuild phase was introduced to follow a modification in qscintilla
build (76ad279) that forced the library
libqscintilla2_qt5.so to be called libqscintilla2.so. This has been
inproved in 4bf49d9 so the preBuild
trick is not necessary anymore.
    @lsix
    lsix committed Oct 4, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    GPG key ID: 4C4BEFD7B18DC5E8
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    51c6082 View commit details

  2. Merge pull request #70399 from lsix/simplify-openscad 

    openscad: remove useless preBuild phase
    @gebner
    gebner authored Oct 4, 2019
    Copy the full SHA
    ec181f7 View commit details
Showing with 0 additions and 4 deletions.
  1. +0 −4 pkgs/applications/graphics/openscad/default.nix
4 changes: 0 additions & 4 deletions pkgs/applications/graphics/openscad/default.nix
View file
Original file line number Diff line number Diff line change
@@ -53,10 +53,6 @@ mkDerivation rec {
# src/lexer.l:36:10: fatal error: parser.hxx: No such file or directory
enableParallelBuilding = false; # true by default due to qmake

preBuild = ''
sed -re 's/qscintilla2_qt5/qscintilla2/g' -i Makefile
'';

postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
mkdir $out/Applications
mv $out/bin/*.app $out/Applications