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

Commits on Jan 9, 2020

  1. librecad: fix build 

    recently this stopped building on nixos-unstable

a git bisect of nixpkgs revealed;

`# first bad commit: [8f729c0] gcc: switch default to gcc9`

this switches the build to use gcc8Stdenv
    @Kiwi
    Kiwi committed Jan 9, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    GPG key ID: 7FAB2A15F7A607A4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e0f6da5 View commit details

  2. Merge pull request #77348 from Kiwi/fix-librecad 

    librecad: fix build
    @worldofpeace
    worldofpeace authored Jan 9, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    GPG key ID: 7FAB2A15F7A607A4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ed165ad View commit details
Showing with 42 additions and 12 deletions.
  1. +40 −10 pkgs/applications/misc/librecad/default.nix
  2. +2 −2 pkgs/top-level/all-packages.nix
50 changes: 40 additions & 10 deletions pkgs/applications/misc/librecad/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,23 @@
{ mkDerivation, lib, fetchFromGitHub, installShellFiles, pkgconfig, runtimeShell
, qtbase, qtsvg, qttools, qmake
, boost, muparser }:

mkDerivation rec {
{ boost
, fetchFromGitHub
, installShellFiles
, mkDerivationWith
, muparser
, pkgconfig
, qmake
, qtbase
, qtsvg
, qttools
, runtimeShell
, gcc8Stdenv
}:

let
stdenv = gcc8Stdenv;
in

# Doesn't build with gcc9
mkDerivationWith stdenv.mkDerivation rec {
pname = "librecad";
version = "2.2.0-rc1";

@@ -13,7 +28,9 @@ mkDerivation rec {
sha256 = "0kwj838hqzbw95gl4x6scli9gj3gs72hdmrrkzwq5rjxam18k3f3";
};

patches = [ ./fix_qt_5_11_build.patch ];
patches = [
./fix_qt_5_11_build.patch
];

postPatch = ''
substituteInPlace scripts/postprocess-unix.sh \
@@ -48,17 +65,30 @@ mkDerivation rec {
runHook postInstall
'';

buildInputs = [ boost muparser qtbase qtsvg ];
buildInputs = [
boost
muparser
qtbase
qtsvg
];

nativeBuildInputs = [ installShellFiles pkgconfig qmake qttools ];
nativeBuildInputs = [
installShellFiles
pkgconfig
qmake
qttools
];

enableParallelBuilding = true;

meta = with lib; {
meta = with stdenv.lib; {
description = "2D CAD package based on Qt";
homepage = "https://librecad.org";
license = licenses.gpl2;
maintainers = with maintainers; [ viric ];
maintainers = with maintainers; [
kiwi
viric
];
platforms = platforms.linux;
};
}
4 changes: 2 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -23709,8 +23709,8 @@ in

bftools = callPackage ../applications/science/biology/bftools { };

blast = callPackage ../applications/science/biology/blast {
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
blast = callPackage ../applications/science/biology/blast {
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
};

cd-hit = callPackage ../applications/science/biology/cd-hit { };