librecad: fix build #77348
Merged
librecad: fix build #77348
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ofborg
bot
added
11.by: package-maintainer
10.rebuild-darwin: 0
10.rebuild-linux: 1-10
labels
marsam
reviewed
Jan 9, 2020
There was a problem hiding this comment.
can you set gcc8Stdenv in all-packages.nix? i.e.
diff --git i/pkgs/top-level/all-packages.nix w/pkgs/top-level/all-packages.nix
index b331ee663be..7ef368f8517 100644
--- i/pkgs/top-level/all-packages.nix
+++ w/pkgs/top-level/all-packages.nix
@@ -19880,7 +19880,9 @@ in
libowfat = callPackage ../development/libraries/libowfat { };
- librecad = libsForQt5.callPackage ../applications/misc/librecad { };
+ librecad = libsForQt5.callPackage ../applications/misc/librecad {
+ stdenv = gcc8Stdenv;
+ };
libreoffice = hiPrio libreoffice-still;
libreoffice-unwrapped = libreoffice.libreoffice;
worldofpeace
reviewed
Jan 9, 2020
worldofpeace
suggested changes
Jan 9, 2020
There was a problem hiding this comment.
Please don't use the qt5 namespace for its packages, and restore how it was before.
It's actually specifically in the documentation to do this, because libsForQt5.callPackage ensures the correct versions of the packages are in scope. This should also use mkDerivation and not stdenv.mkDerivation. (it's the qt5 specific one in scope).
Kiwi
force-pushed
the
fix-librecad
branch
2 times, most recently
from
24c1f2f
to
ee43000
Compare
|
@Kiwi Okay, so this is what should be done according to the docs. It's possible qt's diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix
index 84db89fe38c..0df0f86ef45 100644
--- a/pkgs/applications/misc/librecad/default.nix
+++ b/pkgs/applications/misc/librecad/default.nix
@@ -1,7 +1,7 @@
{ boost
, fetchFromGitHub
, installShellFiles
-, mkDerivation
+, mkDerivationWith
, muparser
, pkgconfig
, qmake
@@ -9,11 +9,15 @@
, qtsvg
, qttools
, runtimeShell
-, stdenv
-, wrapQtAppsHook
+, gcc8Stdenv
}:
-stdenv.mkDerivation rec {
+let
+ stdenv = gcc8Stdenv;
+in
+
+# Doesn't build with gcc9
+mkDerivationWith stdenv.mkDerivation rec {
pname = "librecad";
version = "2.2.0-rc1";
@@ -73,7 +77,6 @@ stdenv.mkDerivation rec {
pkgconfig
qmake
qttools
- wrapQtAppsHook
];
enableParallelBuilding = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 579c741be47..f6656969a19 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19878,9 +19878,7 @@ in
libowfat = callPackage ../development/libraries/libowfat { };
- librecad = libsForQt5.callPackage ../applications/misc/librecad {
- stdenv = gcc8Stdenv;
- };
+ librecad = libsForQt5.callPackage ../applications/misc/librecad { };
libreoffice = hiPrio libreoffice-still;
libreoffice-unwrapped = libreoffice.libreoffice;
@@ -23699,8 +23697,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 { };
|
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
|
Cool thanks @Kiwi ✨ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
recently this stopped building on nixos-unstable
a git bisect of nixpkgs revealed;
# first bad commit: [8f729c0070ec3f78edadeaebcbd110257fe4577e] gcc: switch default to gcc9this switches the build to use gcc8Stdenv
Motivation for this change
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)Notify maintainers
cc @