libjack2: move headers to "dev" outputs#226315
Merged
trofi merged 1 commit intoNixOS:stagingfrom May 17, 2023
Merged
Conversation
ofborg
bot
added
10.rebuild-darwin: 501+
vcunat
added
the
6.topic: closure size
Member
diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix
index 6afddb467d0..d7a0357429a 100644
--- a/pkgs/applications/audio/csound/default.nix
+++ b/pkgs/applications/audio/csound/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp
++ lib.optional stdenv.isDarwin "-DCS_FRAMEWORK_DEST=${placeholder "out"}/lib"
- ++ lib.optional (libjack2 != null) "-DJACK_HEADER=${libjack2}/include/jack/jack.h";
+ ++ lib.optional (libjack2 != null) "-DJACK_HEADER=${lib.getDev libjack2}/include/jack/jack.h";
nativeBuildInputs = [ cmake flex bison gettext ];
buildInputs = [ libsndfile libsamplerate boost ]
diff --git a/pkgs/applications/audio/nootka/default.nix b/pkgs/applications/audio/nootka/default.nix
index 2b2372c6d87..3ce835138f6 100644
--- a/pkgs/applications/audio/nootka/default.nix
+++ b/pkgs/applications/audio/nootka/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
];
cmakeFlags = [
- "-DCMAKE_INCLUDE_PATH=${libjack2}/include/jack;${libpulseaudio.dev}/include/pulse"
+ "-DCMAKE_INCLUDE_PATH=${lib.getDev libjack2}/include/jack;${lib.getDev libpulseaudio}/include/pulse"
"-DENABLE_JACK=ON"
"-DENABLE_PULSEAUDIO=ON"
];
diff --git a/pkgs/applications/audio/polyphone/default.nix b/pkgs/applications/audio/polyphone/default.nix
index 568f3b6ba15..9ab81d2a5c4 100644
--- a/pkgs/applications/audio/polyphone/default.nix
+++ b/pkgs/applications/audio/polyphone/default.nix
@@ -36,7 +36,7 @@ mkDerivation rec {
qmakeFlags = [
"DEFINES+=USE_LOCAL_STK"
"DEFINES+=USE_LOCAL_QCUSTOMPLOT"
- "INCLUDEPATH+=${libjack2}/include/jack"
+ "INCLUDEPATH+=${lib.getDev libjack2}/include/jack"
];
meta = with lib; {
diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix
index 1f0e68bb9c0..5a75fb52329 100644
--- a/pkgs/tools/misc/timidity/default.nix
+++ b/pkgs/tools/misc/timidity/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
"AR=${stdenv.cc.targetPrefix}ar"
];
- NIX_LDFLAGS = "-ljack -L${libjack2}/lib";
+ NIX_LDFLAGS = "-ljack -L${lib.getLib libjack2}/lib";
instruments = fetchurl {
url = "http://www.csee.umbc.edu/pub/midia/instruments.tar.gz"; |
Contributor
Author
|
Good catch! converting to draft. |
Contributor
Author
|
Proposed |
Contributor
Author
|
Proposed |
Contributor
Author
|
Proposed |
Contributor
Author
|
Proposed |
Contributor
Author
|
All the dependencies are sorted. Ready for review. |
vcunat
added a commit
that referenced
this pull request
May 30, 2023
The split was merged in cfe0093 from PR #226315 This fixes qtractor build (and maybe others): https://hydra.nixos.org/build/221582472/nixlog/3/tail
Member
|
It's generally good to glance at the |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Description of changes
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)