mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
[Backport release-26.05] recordbox: 0.10.4 -> 0.11.0 (#526996)
This commit is contained in:
commit
7c54e54518
2 changed files with 7 additions and 52 deletions
|
|
@ -1,24 +0,0 @@
|
|||
diff --git a/vendor/glycin/src/sandbox.rs b/vendor/glycin/src/sandbox.rs
|
||||
index 08db832..4f44b21 100644
|
||||
--- a/vendor/glycin/src/sandbox.rs
|
||||
+++ b/vendor/glycin/src/sandbox.rs
|
||||
@@ -202,7 +202,7 @@ impl Sandbox {
|
||||
|
||||
args.push(self.exec());
|
||||
|
||||
- ("bwrap".into(), args, Some(seccomp_memfd))
|
||||
+ ("@bwrap@".into(), args, Some(seccomp_memfd))
|
||||
}
|
||||
SandboxMechanism::FlatpakSpawn => {
|
||||
let memory_limit = Self::memory_limit();
|
||||
@@ -299,8 +299,8 @@ impl Sandbox {
|
||||
"/",
|
||||
// Make /usr available as read only
|
||||
"--ro-bind",
|
||||
- "/usr",
|
||||
- "/usr",
|
||||
+ "/nix/store",
|
||||
+ "/nix/store",
|
||||
// Make tmpfs dev available
|
||||
"--dev",
|
||||
"/dev",
|
||||
|
|
@ -3,7 +3,6 @@
|
|||
stdenv,
|
||||
appstream-glib,
|
||||
blueprint-compiler,
|
||||
bubblewrap,
|
||||
cargo,
|
||||
dbus,
|
||||
desktop-file-utils,
|
||||
|
|
@ -15,39 +14,32 @@
|
|||
hicolor-icon-theme,
|
||||
lcms2,
|
||||
libadwaita,
|
||||
libglycin,
|
||||
libseccomp,
|
||||
libxml2,
|
||||
meson,
|
||||
ninja,
|
||||
nix-update-script,
|
||||
pkg-config,
|
||||
replaceVars,
|
||||
rustPlatform,
|
||||
rustc,
|
||||
sqlite,
|
||||
wrapGAppsHook4,
|
||||
}:
|
||||
|
||||
let
|
||||
glycinPathsPatch = replaceVars ./fix-glycin-paths.patch {
|
||||
bwrap = "${bubblewrap}/bin/bwrap";
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "recordbox";
|
||||
version = "0.10.4";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "edestcroix";
|
||||
repo = "Recordbox";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-9rrVlD+ODl+U9bPzbXGLQBLkbnfAm4SmJHRcVife33A=";
|
||||
hash = "sha256-HskhMZy8y61c/j/F5e5aM41AQ8t+TCUq/iY23SFB92o=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-W60X69/fEq/X6AK1sbT6rb+SsF/oPzfUvrar0fihr88=";
|
||||
hash = "sha256-xHukIMUG5himj1umKn+IKM7kJ29MH/pt/jPEHd2EeT0=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
@ -60,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
glib # For `glib-compile-schemas`
|
||||
gtk4 # For `gtk-update-icon-cache`
|
||||
libxml2 # For `xmllint`
|
||||
libglycin.patchVendorHook
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
|
|
@ -70,6 +63,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
libglycin.setupHook
|
||||
glycin-loaders
|
||||
dbus
|
||||
gtk4
|
||||
hicolor-icon-theme
|
||||
|
|
@ -92,22 +87,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||
cargoCheckType = if (finalAttrs.mesonBuildType != "debug") then "release" else "debug";
|
||||
|
||||
# Workaround copied from https://github.com/NixOS/nixpkgs/blob/e39fe935fc7537bee0440935c12f5c847735a291/pkgs/by-name/lo/loupe/package.nix#L60-L74
|
||||
preConfigure = ''
|
||||
# Dirty approach to add patches after cargoSetupPostUnpackHook
|
||||
# We should eventually use a cargo vendor patch hook instead
|
||||
pushd ../$(stripHash $cargoDeps)/glycin-2.*
|
||||
patch -p3 < ${glycinPathsPatch}
|
||||
popd
|
||||
'';
|
||||
preFixup = ''
|
||||
# Needed for the glycin crate to find loaders.
|
||||
# https://gitlab.gnome.org/sophie-h/glycin/-/blob/0.1.beta.2/glycin/src/config.rs#L44
|
||||
gappsWrapperArgs+=(
|
||||
--prefix XDG_DATA_DIRS : "${glycin-loaders}/share"
|
||||
)
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue