Merge remote-tracking branch 'origin/master' into staging-next
This commit is contained in:
commit
b76567c281
@ -18,18 +18,21 @@ let cfg = config.services.libinput;
|
||||
};
|
||||
|
||||
accelProfile = mkOption {
|
||||
type = types.enum [ "flat" "adaptive" ];
|
||||
type = types.enum [ "flat" "adaptive" "custom" ];
|
||||
default = "adaptive";
|
||||
example = "flat";
|
||||
description = ''
|
||||
Sets the pointer acceleration profile to the given profile.
|
||||
Permitted values are `adaptive`, `flat`.
|
||||
Permitted values are `adaptive`, `flat`, `custom`.
|
||||
Not all devices support this option or all profiles.
|
||||
If a profile is unsupported, the default profile for this is used.
|
||||
`flat`: Pointer motion is accelerated by a constant
|
||||
(device-specific) factor, depending on the current speed.
|
||||
`adaptive`: Pointer acceleration depends on the input speed.
|
||||
This is the default profile for most devices.
|
||||
`custom`: Allows the user to define a custom acceleration function.
|
||||
To define custom functions use the accelPoints<Fallback/Motion/Scroll>
|
||||
and accelStep<Fallback/Motion/Scroll> options.
|
||||
'';
|
||||
};
|
||||
|
||||
@ -37,7 +40,73 @@ let cfg = config.services.libinput;
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
example = "-0.5";
|
||||
description = "Cursor acceleration (how fast speed increases from minSpeed to maxSpeed).";
|
||||
description = ''
|
||||
Cursor acceleration (how fast speed increases from minSpeed to maxSpeed).
|
||||
This only applies to the flat or adaptive profile.
|
||||
'';
|
||||
};
|
||||
|
||||
accelPointsFallback = mkOption {
|
||||
type = types.nullOr (types.listOf types.number);
|
||||
default = null;
|
||||
example = [ 0.0 1.0 2.4 2.5 ];
|
||||
description = ''
|
||||
Sets the points of the fallback acceleration function. The value must be a list of
|
||||
floating point non-negative numbers. This only applies to the custom profile.
|
||||
'';
|
||||
};
|
||||
|
||||
accelPointsMotion = mkOption {
|
||||
type = types.nullOr (types.listOf types.number);
|
||||
default = null;
|
||||
example = [ 0.0 1.0 2.4 2.5 ];
|
||||
description = ''
|
||||
Sets the points of the (pointer) motion acceleration function. The value must be a
|
||||
list of floating point non-negative numbers. This only applies to the custom profile.
|
||||
'';
|
||||
};
|
||||
|
||||
accelPointsScroll = mkOption {
|
||||
type = types.nullOr (types.listOf types.number);
|
||||
default = null;
|
||||
example = [ 0.0 1.0 2.4 2.5 ];
|
||||
description = ''
|
||||
Sets the points of the scroll acceleration function. The value must be a list of
|
||||
floating point non-negative numbers. This only applies to the custom profile.
|
||||
'';
|
||||
};
|
||||
|
||||
accelStepFallback = mkOption {
|
||||
type = types.nullOr types.number;
|
||||
default = null;
|
||||
example = 0.1;
|
||||
description = ''
|
||||
Sets the step between the points of the fallback acceleration function. When a step of
|
||||
0.0 is provided, libinput's Fallback acceleration function is used. This only applies
|
||||
to the custom profile.
|
||||
'';
|
||||
};
|
||||
|
||||
accelStepMotion = mkOption {
|
||||
type = types.nullOr types.number;
|
||||
default = null;
|
||||
example = 0.1;
|
||||
description = ''
|
||||
Sets the step between the points of the (pointer) motion acceleration function. When a
|
||||
step of 0.0 is provided, libinput's Fallback acceleration function is used. This only
|
||||
applies to the custom profile.
|
||||
'';
|
||||
};
|
||||
|
||||
accelStepScroll = mkOption {
|
||||
type = types.nullOr types.number;
|
||||
default = null;
|
||||
example = 0.1;
|
||||
description = ''
|
||||
Sets the step between the points of the scroll acceleration function. When a step of
|
||||
0.0 is provided, libinput's Fallback acceleration function is used. This only applies
|
||||
to the custom profile.
|
||||
'';
|
||||
};
|
||||
|
||||
buttonMapping = mkOption {
|
||||
@ -203,6 +272,12 @@ let cfg = config.services.libinput;
|
||||
${optionalString (cfg.${deviceType}.dev != null) ''MatchDevicePath "${cfg.${deviceType}.dev}"''}
|
||||
Option "AccelProfile" "${cfg.${deviceType}.accelProfile}"
|
||||
${optionalString (cfg.${deviceType}.accelSpeed != null) ''Option "AccelSpeed" "${cfg.${deviceType}.accelSpeed}"''}
|
||||
${optionalString (cfg.${deviceType}.accelPointsFallback != null) ''Option "AccelPointsFallback" "${toString cfg.${deviceType}.accelPointsFallback}"''}
|
||||
${optionalString (cfg.${deviceType}.accelPointsMotion != null) ''Option "AccelPointsMotion" "${toString cfg.${deviceType}.accelPointsMotion}"''}
|
||||
${optionalString (cfg.${deviceType}.accelPointsScroll != null) ''Option "AccelPointsScroll" "${toString cfg.${deviceType}.accelPointsScroll}"''}
|
||||
${optionalString (cfg.${deviceType}.accelStepFallback != null) ''Option "AccelStepFallback" "${toString cfg.${deviceType}.accelStepFallback}"''}
|
||||
${optionalString (cfg.${deviceType}.accelStepMotion != null) ''Option "AccelStepMotion" "${toString cfg.${deviceType}.accelStepMotion}"''}
|
||||
${optionalString (cfg.${deviceType}.accelStepScroll != null) ''Option "AccelStepScroll" "${toString cfg.${deviceType}.accelStepScroll}"''}
|
||||
${optionalString (cfg.${deviceType}.buttonMapping != null) ''Option "ButtonMapping" "${cfg.${deviceType}.buttonMapping}"''}
|
||||
${optionalString (cfg.${deviceType}.calibrationMatrix != null) ''Option "CalibrationMatrix" "${cfg.${deviceType}.calibrationMatrix}"''}
|
||||
${optionalString (cfg.${deviceType}.transformationMatrix != null) ''Option "TransformationMatrix" "${cfg.${deviceType}.transformationMatrix}"''}
|
||||
|
@ -82,7 +82,7 @@ in
|
||||
(username: opts: {
|
||||
assertion = (opts.password == opts.initialPassword || opts.password == null) &&
|
||||
(opts.hashedPassword == opts.initialHashedPassword || opts.hashedPassword == null);
|
||||
message = "${username} uses password or hashedPassword. systemd-sysupdate only supports initial passwords. It'll never update your passwords.";
|
||||
message = "user '${username}' uses password or hashedPassword. systemd-sysupdate only supports initial passwords. It'll never update your passwords.";
|
||||
})
|
||||
systemUsers;
|
||||
|
||||
|
@ -1410,6 +1410,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/uga-rosa/ccc.nvim/";
|
||||
};
|
||||
|
||||
cellular-automaton-nvim = buildVimPlugin {
|
||||
pname = "cellular-automaton.nvim";
|
||||
version = "2024-06-30";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Eandrju";
|
||||
repo = "cellular-automaton.nvim";
|
||||
rev = "11aea08aa084f9d523b0142c2cd9441b8ede09ed";
|
||||
sha256 = "0jvz2vnyhm6a2zyz93sh87n59vga2l016ijrfybfrlv44hhzp2ww";
|
||||
};
|
||||
meta.homepage = "https://github.com/Eandrju/cellular-automaton.nvim/";
|
||||
};
|
||||
|
||||
chadtree = buildVimPlugin {
|
||||
pname = "chadtree";
|
||||
version = "2024-07-25";
|
||||
@ -2874,6 +2886,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/";
|
||||
};
|
||||
|
||||
darkearth-nvim = buildVimPlugin {
|
||||
pname = "darkearth-nvim";
|
||||
version = "2024-07-19";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ptdewey";
|
||||
repo = "darkearth-nvim";
|
||||
rev = "d53cc2384d0a84889bd44361cee33019bac02c58";
|
||||
sha256 = "0m04m4mi8f7pzsx9d92xy20b4yw10gyqk4gmxdlr46y6byfwwlyj";
|
||||
};
|
||||
meta.homepage = "https://github.com/ptdewey/darkearth-nvim/";
|
||||
};
|
||||
|
||||
dart-vim-plugin = buildVimPlugin {
|
||||
pname = "dart-vim-plugin";
|
||||
version = "2024-07-02";
|
||||
@ -10135,6 +10159,18 @@ final: prev:
|
||||
meta.homepage = "https://github.com/kovisoft/slimv/";
|
||||
};
|
||||
|
||||
smart-open-nvim = buildVimPlugin {
|
||||
pname = "smart-open.nvim";
|
||||
version = "2024-08-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "danielfalk";
|
||||
repo = "smart-open.nvim";
|
||||
rev = "87626ee8748b9bba22093adec7bb58c63e7214f0";
|
||||
sha256 = "sha256-ro4qFdEAnE5u8wt7NyIc7OHobvjRotVX+LZ0P5as8EU=";
|
||||
};
|
||||
meta.homepage = "https://github.com/danielfalk/smart-open.nvim/";
|
||||
};
|
||||
|
||||
smart-splits-nvim = buildVimPlugin {
|
||||
pname = "smart-splits.nvim";
|
||||
version = "2024-08-02";
|
||||
|
@ -1477,6 +1477,10 @@
|
||||
dependencies = [ self.skim ];
|
||||
};
|
||||
|
||||
smart-open-nvim = super.smart-open-nvim.overrideAttrs {
|
||||
dependencies = with self; [ telescope-nvim sqlite-lua ];
|
||||
};
|
||||
|
||||
sniprun =
|
||||
let
|
||||
version = "1.3.15";
|
||||
|
@ -117,6 +117,7 @@ https://github.com/itchyny/calendar.vim/,,
|
||||
https://github.com/bkad/camelcasemotion/,,
|
||||
https://github.com/tyru/caw.vim/,,
|
||||
https://github.com/uga-rosa/ccc.nvim/,HEAD,
|
||||
https://github.com/Eandrju/cellular-automaton.nvim/,HEAD,
|
||||
https://github.com/ms-jpq/chadtree/,HEAD,
|
||||
https://github.com/vim-scripts/changeColorScheme.vim/,,
|
||||
https://github.com/sudormrfbin/cheatsheet.nvim/,,
|
||||
@ -239,6 +240,7 @@ https://github.com/FelikZ/ctrlp-py-matcher/,,
|
||||
https://github.com/amiorin/ctrlp-z/,,
|
||||
https://github.com/ctrlpvim/ctrlp.vim/,,
|
||||
https://github.com/scottmckendry/cyberdream.nvim/,,
|
||||
https://github.com/ptdewey/darkearth-nvim/,HEAD,
|
||||
https://github.com/dart-lang/dart-vim-plugin/,,
|
||||
https://github.com/rizzatti/dash.vim/,HEAD,
|
||||
https://github.com/glepnir/dashboard-nvim/,,
|
||||
@ -853,6 +855,7 @@ https://github.com/AndrewRadev/sideways.vim/,,
|
||||
https://github.com/lotabout/skim.vim/,,
|
||||
https://github.com/mopp/sky-color-clock.vim/,,
|
||||
https://github.com/kovisoft/slimv/,,
|
||||
https://github.com/danielfalk/smart-open.nvim,0.2.x,
|
||||
https://github.com/mrjones2014/smart-splits.nvim/,,
|
||||
https://github.com/m4xshen/smartcolumn.nvim/,,
|
||||
https://github.com/gorkunov/smartpairs.vim/,,
|
||||
|
@ -2846,13 +2846,14 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscord";
|
||||
publisher = "leonardssh";
|
||||
version = "5.2.12";
|
||||
hash = "sha256-WGDEizYG6UAqe1jnhvjfFouXDA9Yr5P+BjxPahAIsTE=";
|
||||
version = "5.2.13";
|
||||
hash = "sha256-Jgm3ekXFLhylX7RM6tdfi+lRLrcl4UQGmRHbr27M59M=";
|
||||
};
|
||||
meta = {
|
||||
description = "Highly customizable Discord Rich Presence extension for Visual Studio Code";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=leonardssh.vscord";
|
||||
homepage = "https://github.com/leonardssh/vscord";
|
||||
maintainers = [ lib.maintainers.ryand56 ];
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
};
|
||||
|
@ -69,9 +69,9 @@ in rec {
|
||||
|
||||
unstable = fetchurl rec {
|
||||
# NOTE: Don't forget to change the hash for staging as well.
|
||||
version = "9.15";
|
||||
version = "9.16";
|
||||
url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz";
|
||||
hash = "sha256-ea3vQ23WjdvXAXhnCjwjqpjor9VUCsD0I0WJTEWLeN0=";
|
||||
hash = "sha256-iQQq6MgLIzP4p9GId/xBecB9Y1erfyjMvabQbzwzDFA=";
|
||||
inherit (stable) patches;
|
||||
|
||||
## see http://wiki.winehq.org/Gecko
|
||||
@ -88,9 +88,9 @@ in rec {
|
||||
|
||||
## see http://wiki.winehq.org/Mono
|
||||
mono = fetchurl rec {
|
||||
version = "9.2.0";
|
||||
version = "9.3.0";
|
||||
url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
|
||||
hash = "sha256-/VgpJE2SmFuKQEdFrd21jDqbC7ttVMpMbq+G6kZnNfk=";
|
||||
hash = "sha256-bKLArtCW/57CD69et2xrfX3oLZqIdax92fB5O/nD/TA=";
|
||||
};
|
||||
|
||||
updateScript = writeShellScript "update-wine-unstable" ''
|
||||
@ -117,7 +117,7 @@ in rec {
|
||||
staging = fetchFromGitLab rec {
|
||||
# https://gitlab.winehq.org/wine/wine-staging
|
||||
inherit (unstable) version;
|
||||
hash = "sha256-ss0B1MsDd37xTTFT86bEfVOt5mEAuHj14rTnGboO9i8=";
|
||||
hash = "sha256-CUVUatw9SH/LwYwloGHsU8TFjAVQRhd3WBk4AP+2NH4=";
|
||||
domain = "gitlab.winehq.org";
|
||||
owner = "wine";
|
||||
repo = "wine-staging";
|
||||
|
@ -100,13 +100,13 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "blender";
|
||||
version = "4.2.0";
|
||||
version = "4.2.1";
|
||||
|
||||
srcs = [
|
||||
(fetchzip {
|
||||
name = "source";
|
||||
url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-STG4IuEhkdA+sDPIpCAkSflyd3rSUZ9ZCS9PdB4vyTY=";
|
||||
hash = "sha256-+Y4JbzeK+30fO8WdEmvjOeQjm094ofsUhRFXs9mkcxI=";
|
||||
})
|
||||
(fetchgit {
|
||||
name = "assets";
|
||||
@ -427,7 +427,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
# the current apple sdk is too old (currently 11_0) and fails to build "metal" on x86_64-darwin
|
||||
broken = stdenv.hostPlatform.system == "x86_64-darwin";
|
||||
maintainers = with lib.maintainers; [ veprbl ];
|
||||
maintainers = with lib.maintainers; [
|
||||
amarshall
|
||||
veprbl
|
||||
];
|
||||
mainProgram = "blender";
|
||||
};
|
||||
})
|
||||
|
@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config";
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "process-compose";
|
||||
version = "1.24.0";
|
||||
version = "1.24.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "F1bonacc1";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CrirbzsPAoS6eNMCzQilWlLvZGm05ojkVYUiYVY/uHo=";
|
||||
hash = "sha256-R+FkaCAI7Kkxd1UfdmeYo9BEUN0HUGZf2UDKxEvlTlQ=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
|
@ -55,16 +55,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rio";
|
||||
version = "0.1.7";
|
||||
version = "0.1.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raphamorim";
|
||||
repo = "rio";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-3isj4FvzJpheUi12oQRNBvOxR8daL/J4RUOGgYLeBXQ=";
|
||||
hash = "sha256-NLvCLyIts3NoSqbR9PIhXj3GCeURrBXXv/zVgZecfNQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-T+lXgNsMmq6cvsNe96R3F13SbboRAdd11UHumksqx4A=";
|
||||
cargoHash = "sha256-TvNmTI3At2ezsdEOd5mAc6uUQXgGP47d0AMVVUUJr/A=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
ncurses
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cowsay";
|
||||
version = "3.8.2";
|
||||
version = "3.8.3";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "cowsay-org";
|
||||
repo = "cowsay";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-IvodIoPrXI0D9pB95JPUBAIfxxnGDWl30P+WRf8VXIw=";
|
||||
hash = "sha256-Bca+/a9jXsNnuBeYEjjtvZ1LsMMraLKiCn04CiS+uXU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
34
pkgs/by-name/de/deploy-rs/package.nix
Normal file
34
pkgs/by-name/de/deploy-rs/package.nix
Normal file
@ -0,0 +1,34 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
darwin,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "deploy-rs";
|
||||
version = "0-unstable-2024-06-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "serokell";
|
||||
repo = "deploy-rs";
|
||||
rev = "3867348fa92bc892eba5d9ddb2d7a97b9e127a8a";
|
||||
hash = "sha256-FaGrf7qwZ99ehPJCAwgvNY5sLCqQ3GDiE/6uLhxxwSY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-lsW810bktMzHZIbuN3pz9N+IUcjNtE5J2AuB/G6pGWI=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.CoreServices
|
||||
darwin.apple_sdk.frameworks.SystemConfiguration
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Multi-profile Nix-flake deploy tool";
|
||||
homepage = "https://github.com/serokell/deploy-rs";
|
||||
license = lib.licenses.mpl20;
|
||||
maintainers = with lib.maintainers; [ teutat3s ];
|
||||
mainProgram = "deploy";
|
||||
};
|
||||
}
|
@ -17,26 +17,26 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "glide-media-player";
|
||||
version = "0.6.3";
|
||||
version = "0.6.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "philn";
|
||||
repo = "glide";
|
||||
rev = version;
|
||||
hash = "sha256-rWWMMuA41uFWazIJBVLxzaCrR5X5tI4x+GXXYkfeqz8=";
|
||||
hash = "sha256-gmBXUj6LxC7VDH/ni8neYivysagqcbI/UCUq9Ly3D24=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-Kvdbo5tkhwsah9W7Y5zqpoA3bVHfmjGj7Cjsqxkljls=";
|
||||
hash = "sha256-u41H746/nPX2PmpyweUp4Y9k+XIruazgMdU6B4ig708=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace scripts/meson_post_install.py \
|
||||
--replace-warn "gtk-update-icon-cache" "gtk4-update-icon-cache"
|
||||
substituteInPlace data/net.baseart.Glide.desktop \
|
||||
--replace-warn "Icon=net.baseart.Glide.svg" "Icon=net.baseart.Glide"
|
||||
substituteInPlace data/net.base_art.Glide.desktop \
|
||||
--replace-warn "Icon=net.base_art.Glide.svg" "Icon=net.baseart.Glide"
|
||||
patchShebangs --build \
|
||||
scripts/meson_post_install.py \
|
||||
build-aux/cargo-build.py
|
||||
|
15
pkgs/by-name/hy/hyprland/asahi-fix.patch
Normal file
15
pkgs/by-name/hy/hyprland/asahi-fix.patch
Normal file
@ -0,0 +1,15 @@
|
||||
diff --git a/src/protocols/LinuxDMABUF.cpp b/src/protocols/LinuxDMABUF.cpp
|
||||
index 0fbf832e..c6077114 100644
|
||||
--- a/src/protocols/LinuxDMABUF.cpp
|
||||
+++ b/src/protocols/LinuxDMABUF.cpp
|
||||
@@ -492,9 +492,8 @@ CLinuxDMABufV1Protocol::CLinuxDMABufV1Protocol(const wl_interface* iface, const
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
- protoLog(ERR, "DRM device {} has no render node, disabling linux dmabuf", device->nodes[DRM_NODE_PRIMARY] ? device->nodes[DRM_NODE_PRIMARY] : "null");
|
||||
+ protoLog(ERR, "DRM device {} has no render node, disabling linux dmabuf checks", device->nodes[DRM_NODE_PRIMARY] ? device->nodes[DRM_NODE_PRIMARY] : "null");
|
||||
drmFreeDevice(&device);
|
||||
- removeGlobal();
|
||||
}
|
||||
});
|
||||
}
|
@ -77,6 +77,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fixes broken OpenGL applications on Apple silicon (Asahi Linux)
|
||||
# Based on commit https://github.com/hyprwm/Hyprland/commit/279ec1c291021479b050c83a0435ac7076c1aee0
|
||||
./asahi-fix.patch
|
||||
|
||||
# https://github.com/hyprwm/Hyprland/pull/7467
|
||||
(fetchpatch {
|
||||
url = "https://github.com/hyprwm/Hyprland/commit/a437e44a6af8e8f42966ffe3a26c1d562fce6b33.diff";
|
||||
|
@ -69,13 +69,13 @@ let
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "llama-cpp";
|
||||
version = "3565";
|
||||
version = "3620";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggerganov";
|
||||
repo = "llama.cpp";
|
||||
rev = "refs/tags/b${finalAttrs.version}";
|
||||
hash = "sha256-eAsChIG30Oj5aFQyFDtyWqqT2PTgmdJ2jSrsi2UH+Gc=";
|
||||
hash = "sha256-jZyMDNEppMxS+qinqJMU0VfjowzYrvCp5Mn0ub9x6NE=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C "$out" rev-parse --short HEAD > $out/COMMIT
|
||||
|
@ -35,6 +35,9 @@ python3.pkgs.buildPythonApplication rec {
|
||||
# test broken when run under Nix:
|
||||
# "unittest.mock.InvalidSpecError: Cannot spec a Mock object."
|
||||
"test_get_mr_ci_status"
|
||||
# broken because of an incorrect assertion:
|
||||
# "AttributeError: 'has_calls' is not a valid assertion."
|
||||
"test_reapprove"
|
||||
];
|
||||
disabledTestPaths = [
|
||||
# test errors due to API mismatch in test setup:
|
||||
|
@ -13,22 +13,23 @@
|
||||
libmongocrypt,
|
||||
postgresql,
|
||||
makeWrapper,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "n8n";
|
||||
version = "1.48.3";
|
||||
version = "1.55.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "n8n-io";
|
||||
repo = "n8n";
|
||||
rev = "n8n@${finalAttrs.version}";
|
||||
hash = "sha256-aCMbii5+iJ7m4P6Krr1/pcoH6fBsrFLtSjCx9DBYOeg=";
|
||||
hash = "sha256-SgDw0je16Qf0ohzrVUjJM6FFovWxM2mvZjvfKkEESos=";
|
||||
};
|
||||
|
||||
pnpmDeps = pnpm.fetchDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-n1U5ftbB7BbiDIkZMVPG2ieoRBlJ+nPYFT3fNJRRTCI=";
|
||||
hash = "sha256-KvSsWf1EHCQ46M4Z4wqyYb4mW9y9kNwB9e090YC1ZWs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -59,6 +60,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
echo "Removing non-deterministic files"
|
||||
|
||||
rm -r $(find -type d -name .turbo)
|
||||
rm node_modules/.modules.yaml
|
||||
rm packages/nodes-base/dist/types/nodes.json
|
||||
|
||||
echo "Removed non-deterministic files"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@ -71,11 +82,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# makes libmongocrypt bindings not look for static libraries in completely wrong places
|
||||
BUILD_TYPE = "dynamic";
|
||||
|
||||
passthru = {
|
||||
tests = nixosTests.n8n;
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
dontStrip = true;
|
||||
|
@ -33,10 +33,10 @@
|
||||
|
||||
let
|
||||
# Keep these separate so the update script can regex them
|
||||
rpcs3GitVersion = "16833-981a1c56f";
|
||||
rpcs3Version = "0.0.32-16833-981a1c56f";
|
||||
rpcs3Revision = "981a1c56fbfb6056e5496bba9b8678a9dc755405";
|
||||
rpcs3Hash = "sha256-yRJ7RBRWm/HcdT/lw4t5AElsxujxFk0bA/keURCyQac=";
|
||||
rpcs3GitVersion = "16857-1c16ada67";
|
||||
rpcs3Version = "0.0.32-16857-1c16ada67";
|
||||
rpcs3Revision = "1c16ada670bb396e98b33ec4510c1b3efb534724";
|
||||
rpcs3Hash = "sha256-uEk7svLCE/jsiyg6NnINZcqltE8QS9gXOEXpWZfbDF8=";
|
||||
|
||||
inherit (qt6Packages) qtbase qtmultimedia wrapQtAppsHook qtwayland;
|
||||
in
|
||||
|
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "simdutf";
|
||||
version = "5.3.7";
|
||||
version = "5.4.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simdutf";
|
||||
repo = "simdutf";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-n99lt0OYK6OyLArdgPRabQ80ohQgHklpt9saDzKhvJw=";
|
||||
hash = "sha256-oIrrI0Z5x1AvT9y0Ldg8zrkFJj1PZtebhJaL2UtEoB8=";
|
||||
};
|
||||
|
||||
# Fix build on darwin
|
||||
|
@ -11,13 +11,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "werf";
|
||||
version = "2.10.3";
|
||||
version = "2.10.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "werf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/rgM6QQAQDkxYCOuRT3lbB/ojNGZnergCB5C+7Rn8SY=";
|
||||
hash = "sha256-1PpnUTlxjUu7jptpd4U7MRKJfRM8WTeMSgbNcQJeZlM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-OR2nIR2q3iRfaSQSQRKn+jbygETx2+WmkOIjOCIB9O8=";
|
||||
|
@ -6,16 +6,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "xeol";
|
||||
version = "0.9.15";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xeol-io";
|
||||
repo = "xeol";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-/DWBDc8m5XYM5UBX5/GWuPRR3YktRar/LbENx2d5bc4=";
|
||||
hash = "sha256-5QlHfchVRFNpU/sBTS9AWOENU86jBatF6KI97NoJa50=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-9zDzwiVEVsfgVzSrouNtLYpjumoWGlfSDpGWbj+zCGQ=";
|
||||
vendorHash = "sha256-MLNUmJOpgKkIe5NUWYMA5avVvt6QLit0i4hpoaadcrs=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
subPackages = [ "cmd/xeol/" ];
|
||||
|
||||
@ -35,6 +37,5 @@ buildGoModule rec {
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "xeol";
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null;
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "Iosevka${toString set}";
|
||||
version = "31.3.0";
|
||||
version = "31.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "be5invis";
|
||||
repo = "iosevka";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-WrRxVrBJeyUwv0/DYTIHLi52+k2PilC7ay0tc5yq3Pw=";
|
||||
hash = "sha256-qcxsuDk7hcVFsHB/Uj013gTOp9IGfp5cF1BLVbmH9AA=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-xw0GA1aIA/J5hfLQBSE+GJzXfbfWQI2k2pYdenlM9NY=";
|
||||
npmDepsHash = "sha256-bhj5q3HEtSdB5LA6IhBCo4XJwc6a3CUrHaV+d1vcj+I=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
remarshal
|
||||
|
@ -1,21 +1,22 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, qttools
|
||||
, wrapQtAppsHook
|
||||
, dtkwidget
|
||||
, dtkdeclarative
|
||||
, qt5integration
|
||||
, qt5platform-plugins
|
||||
, qtbase
|
||||
, qtsvg
|
||||
, udisks2-qt5
|
||||
, gio-qt
|
||||
, freeimage
|
||||
, ffmpeg
|
||||
, ffmpegthumbnailer
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
qttools,
|
||||
wrapQtAppsHook,
|
||||
dtkwidget,
|
||||
dtkdeclarative,
|
||||
qt5integration,
|
||||
qt5platform-plugins,
|
||||
qtbase,
|
||||
qtsvg,
|
||||
udisks2-qt5,
|
||||
gio-qt,
|
||||
freeimage,
|
||||
ffmpeg,
|
||||
ffmpegthumbnailer,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -1,17 +1,18 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, dtkwidget
|
||||
, qt5integration
|
||||
, qt5platform-plugins
|
||||
, qtbase
|
||||
, qtsvg
|
||||
, dde-qt-dbus-factory
|
||||
, cmake
|
||||
, qttools
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
, gtest
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
dtkwidget,
|
||||
qt5integration,
|
||||
qt5platform-plugins,
|
||||
qtbase,
|
||||
qtsvg,
|
||||
dde-qt-dbus-factory,
|
||||
cmake,
|
||||
qttools,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
gtest,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -1,37 +1,38 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, qttools
|
||||
, wrapQtAppsHook
|
||||
, dtkwidget
|
||||
, wayland
|
||||
, dwayland
|
||||
, qt5integration
|
||||
, qt5platform-plugins
|
||||
, image-editor
|
||||
, qtbase
|
||||
, qtmultimedia
|
||||
, ffmpeg
|
||||
, ffmpegthumbnailer
|
||||
, libusb1
|
||||
, libpciaccess
|
||||
, portaudio
|
||||
, libv4l
|
||||
, gst_all_1
|
||||
, systemd
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
qttools,
|
||||
wrapQtAppsHook,
|
||||
dtkwidget,
|
||||
wayland,
|
||||
dwayland,
|
||||
qt5integration,
|
||||
qt5platform-plugins,
|
||||
image-editor,
|
||||
qtbase,
|
||||
qtmultimedia,
|
||||
ffmpeg,
|
||||
ffmpegthumbnailer,
|
||||
libusb1,
|
||||
libpciaccess,
|
||||
portaudio,
|
||||
libv4l,
|
||||
gst_all_1,
|
||||
systemd,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deepin-camera";
|
||||
version = "unstable-2023-09-26";
|
||||
version = "6.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = "8ad3b6ad2a4f5f0b22a216496a0187a69a1e1bcc";
|
||||
hash = "sha256-/8ddplHJzeu7lrRzN66KhJGkFou4FcXc+BzYFK5YVeE=";
|
||||
rev = version;
|
||||
hash = "sha256-3q8yV8GpCPKW780YpCn+xLeFBGJFoAMmKSFCAH9OXoE=";
|
||||
};
|
||||
|
||||
# QLibrary and dlopen work with LD_LIBRARY_PATH
|
||||
@ -53,26 +54,27 @@ stdenv.mkDerivation rec {
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
dtkwidget
|
||||
wayland
|
||||
dwayland
|
||||
qt5integration
|
||||
qt5platform-plugins
|
||||
image-editor
|
||||
qtbase
|
||||
qtmultimedia
|
||||
ffmpeg
|
||||
ffmpegthumbnailer
|
||||
libusb1
|
||||
libpciaccess
|
||||
portaudio
|
||||
libv4l
|
||||
] ++ (with gst_all_1 ; [
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
]);
|
||||
buildInputs =
|
||||
[
|
||||
dtkwidget
|
||||
wayland
|
||||
dwayland
|
||||
qt5integration
|
||||
qt5platform-plugins
|
||||
image-editor
|
||||
qtbase
|
||||
qtmultimedia
|
||||
ffmpeg
|
||||
ffmpegthumbnailer
|
||||
libusb1
|
||||
libpciaccess
|
||||
portaudio
|
||||
libv4l
|
||||
]
|
||||
++ (with gst_all_1; [
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
]);
|
||||
|
||||
cmakeFlags = [ "-DVERSION=${version}" ];
|
||||
|
||||
@ -84,18 +86,29 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
qtWrapperArgs = [
|
||||
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ ffmpeg ffmpegthumbnailer gst_all_1.gstreamer gst_all_1.gst-plugins-base libusb1 libv4l portaudio systemd ]}"
|
||||
"--prefix LD_LIBRARY_PATH : ${
|
||||
lib.makeLibraryPath [
|
||||
ffmpeg
|
||||
ffmpegthumbnailer
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
libusb1
|
||||
libv4l
|
||||
portaudio
|
||||
systemd
|
||||
]
|
||||
}"
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Tool to view camera, take photo and video";
|
||||
homepage = "https://github.com/linuxdeepin/deepin-camera";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = lib.teams.deepin.members;
|
||||
};
|
||||
}
|
||||
|
@ -1,21 +1,22 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, dtkwidget
|
||||
, qt5integration
|
||||
, qt5platform-plugins
|
||||
, udisks2-qt5
|
||||
, cmake
|
||||
, qtbase
|
||||
, qttools
|
||||
, pkg-config
|
||||
, kcodecs
|
||||
, karchive
|
||||
, wrapQtAppsHook
|
||||
, minizip
|
||||
, libzip
|
||||
, libuuid
|
||||
, libarchive
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
dtkwidget,
|
||||
qt5integration,
|
||||
qt5platform-plugins,
|
||||
udisks2-qt5,
|
||||
cmake,
|
||||
qtbase,
|
||||
qttools,
|
||||
pkg-config,
|
||||
kcodecs,
|
||||
karchive,
|
||||
wrapQtAppsHook,
|
||||
minizip,
|
||||
libzip,
|
||||
libuuid,
|
||||
libarchive,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -62,9 +63,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
# qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
|
||||
qtWrapperArgs = [
|
||||
"--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
|
||||
];
|
||||
qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
|
@ -1,15 +1,16 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, qttools
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
, qtbase
|
||||
, qtsvg
|
||||
, dtkwidget
|
||||
, qt5integration
|
||||
, qt5platform-plugins
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
qttools,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
qtbase,
|
||||
qtsvg,
|
||||
dtkwidget,
|
||||
qt5integration,
|
||||
qt5platform-plugins,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -1,22 +1,23 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, qttools
|
||||
, wrapQtAppsHook
|
||||
, dtkwidget
|
||||
, qt5integration
|
||||
, qt5platform-plugins
|
||||
, qtbase
|
||||
, qtsvg
|
||||
, dde-qt-dbus-factory
|
||||
, kcodecs
|
||||
, syntax-highlighting
|
||||
, libchardet
|
||||
, libuchardet
|
||||
, libiconv
|
||||
, gitUpdater
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
qttools,
|
||||
wrapQtAppsHook,
|
||||
dtkwidget,
|
||||
qt5integration,
|
||||
qt5platform-plugins,
|
||||
qtbase,
|
||||
qtsvg,
|
||||
dde-qt-dbus-factory,
|
||||
kcodecs,
|
||||
syntax-highlighting,
|
||||
libchardet,
|
||||
libuchardet,
|
||||
libiconv,
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -1,22 +1,23 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, pkg-config
|
||||
, qttools
|
||||
, wrapQtAppsHook
|
||||
, qt5platform-plugins
|
||||
, qtbase
|
||||
, dtkwidget
|
||||
, dtkdeclarative
|
||||
, deepin-ocr-plugin-manager
|
||||
, gio-qt
|
||||
, udisks2-qt5
|
||||
, image-editor
|
||||
, libraw
|
||||
, libexif
|
||||
, freeimage
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
pkg-config,
|
||||
qttools,
|
||||
wrapQtAppsHook,
|
||||
qt5platform-plugins,
|
||||
qtbase,
|
||||
dtkwidget,
|
||||
dtkdeclarative,
|
||||
deepin-ocr-plugin-manager,
|
||||
gio-qt,
|
||||
udisks2-qt5,
|
||||
image-editor,
|
||||
libraw,
|
||||
libexif,
|
||||
freeimage,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -1,33 +1,34 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
, qttools
|
||||
, qtx11extras
|
||||
, qtmultimedia
|
||||
, dtkwidget
|
||||
, qt5integration
|
||||
, qt5platform-plugins
|
||||
, qtmpris
|
||||
, qtdbusextended
|
||||
, gsettings-qt
|
||||
, elfutils
|
||||
, ffmpeg
|
||||
, ffmpegthumbnailer
|
||||
, mpv
|
||||
, xorg
|
||||
, pcre
|
||||
, libdvdread
|
||||
, libdvdnav
|
||||
, libunwind
|
||||
, libva
|
||||
, zstd
|
||||
, glib
|
||||
, gst_all_1
|
||||
, gtest
|
||||
, libpulseaudio
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
qttools,
|
||||
qtx11extras,
|
||||
qtmultimedia,
|
||||
dtkwidget,
|
||||
qt5integration,
|
||||
qt5platform-plugins,
|
||||
qtmpris,
|
||||
qtdbusextended,
|
||||
gsettings-qt,
|
||||
elfutils,
|
||||
ffmpeg,
|
||||
ffmpegthumbnailer,
|
||||
mpv,
|
||||
xorg,
|
||||
pcre,
|
||||
libdvdread,
|
||||
libdvdnav,
|
||||
libunwind,
|
||||
libva,
|
||||
zstd,
|
||||
glib,
|
||||
gst_all_1,
|
||||
gtest,
|
||||
libpulseaudio,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -41,11 +42,12 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-1UbrNufetedla8TMFPze1hP/R2cZN7SEYEtrK4/5/RQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./dont_use_libPath.diff
|
||||
];
|
||||
patches = [ ./dont_use_libPath.diff ];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
@ -54,34 +56,36 @@ stdenv.mkDerivation rec {
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
dtkwidget
|
||||
qt5integration
|
||||
qt5platform-plugins
|
||||
qtx11extras
|
||||
qtmultimedia
|
||||
qtdbusextended
|
||||
qtmpris
|
||||
gsettings-qt
|
||||
elfutils
|
||||
ffmpeg
|
||||
ffmpegthumbnailer
|
||||
xorg.libXtst
|
||||
xorg.libXdmcp
|
||||
xorg.xcbproto
|
||||
pcre.dev
|
||||
libdvdread
|
||||
libdvdnav
|
||||
libunwind
|
||||
libva
|
||||
zstd
|
||||
mpv
|
||||
gtest
|
||||
libpulseaudio
|
||||
] ++ (with gst_all_1; [
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
]);
|
||||
buildInputs =
|
||||
[
|
||||
dtkwidget
|
||||
qt5integration
|
||||
qt5platform-plugins
|
||||
qtx11extras
|
||||
qtmultimedia
|
||||
qtdbusextended
|
||||
qtmpris
|
||||
gsettings-qt
|
||||
elfutils
|
||||
ffmpeg
|
||||
ffmpegthumbnailer
|
||||
xorg.libXtst
|
||||
xorg.libXdmcp
|
||||
xorg.xcbproto
|
||||
pcre.dev
|
||||
libdvdread
|
||||
libdvdnav
|
||||
libunwind
|
||||
libva
|
||||
zstd
|
||||
mpv
|
||||
gtest
|
||||
libpulseaudio
|
||||
]
|
||||
++ (with gst_all_1; [
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
]);
|
||||
|
||||
propagatedBuildInputs = [
|
||||
qtmultimedia
|
||||
@ -94,14 +98,20 @@ stdenv.mkDerivation rec {
|
||||
"-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DVERSION=${version}"
|
||||
];
|
||||
cmakeFlags = [ "-DVERSION=${version}" ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
qtWrapperArgs = [
|
||||
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ mpv ffmpeg ffmpegthumbnailer gst_all_1.gstreamer gst_all_1.gst-plugins-base ]}"
|
||||
"--prefix LD_LIBRARY_PATH : ${
|
||||
lib.makeLibraryPath [
|
||||
mpv
|
||||
ffmpeg
|
||||
ffmpegthumbnailer
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
]
|
||||
}"
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
|
@ -1,24 +1,25 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, qttools
|
||||
, wrapQtAppsHook
|
||||
, dtkwidget
|
||||
, dtkdeclarative
|
||||
, qt5integration
|
||||
, qt5platform-plugins
|
||||
, udisks2-qt5
|
||||
, qtmpris
|
||||
, qtmultimedia
|
||||
, kcodecs
|
||||
, ffmpeg
|
||||
, libvlc
|
||||
, taglib
|
||||
, SDL2
|
||||
, qtbase
|
||||
, gst_all_1
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
qttools,
|
||||
wrapQtAppsHook,
|
||||
dtkwidget,
|
||||
dtkdeclarative,
|
||||
qt5integration,
|
||||
qt5platform-plugins,
|
||||
udisks2-qt5,
|
||||
qtmpris,
|
||||
qtmultimedia,
|
||||
kcodecs,
|
||||
ffmpeg,
|
||||
libvlc,
|
||||
taglib,
|
||||
SDL2,
|
||||
qtbase,
|
||||
gst_all_1,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -32,9 +33,7 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-MLfkSO8ru8MKiwgiQ0mPO3zGlnIeSHPc0Op5jjzJ6PE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
"${src}/patches/fix-library-path.patch"
|
||||
];
|
||||
patches = [ "${src}/patches/fix-library-path.patch" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
@ -43,28 +42,28 @@ stdenv.mkDerivation rec {
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
dtkwidget
|
||||
dtkdeclarative
|
||||
qt5integration
|
||||
qt5platform-plugins
|
||||
udisks2-qt5
|
||||
qtmpris
|
||||
qtmultimedia
|
||||
kcodecs
|
||||
ffmpeg
|
||||
libvlc
|
||||
taglib
|
||||
SDL2
|
||||
] ++ (with gst_all_1; [
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
]);
|
||||
buildInputs =
|
||||
[
|
||||
dtkwidget
|
||||
dtkdeclarative
|
||||
qt5integration
|
||||
qt5platform-plugins
|
||||
udisks2-qt5
|
||||
qtmpris
|
||||
qtmultimedia
|
||||
kcodecs
|
||||
ffmpeg
|
||||
libvlc
|
||||
taglib
|
||||
SDL2
|
||||
]
|
||||
++ (with gst_all_1; [
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
]);
|
||||
|
||||
cmakeFlags = [
|
||||
"-DVERSION=${version}"
|
||||
];
|
||||
cmakeFlags = [ "-DVERSION=${version}" ];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
"-I${libvlc}/include/vlc/plugins"
|
||||
|
@ -1,14 +1,15 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, qmake
|
||||
, qttools
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
, dtkwidget
|
||||
, qtbase
|
||||
, qtsvg
|
||||
, xorg
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
qmake,
|
||||
qttools,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
dtkwidget,
|
||||
qtbase,
|
||||
qtsvg,
|
||||
xorg,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -1,23 +1,24 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, qmake
|
||||
, pkg-config
|
||||
, qttools
|
||||
, wrapQtAppsHook
|
||||
, dtkwidget
|
||||
, qt5integration
|
||||
, qt5platform-plugins
|
||||
, dde-qt-dbus-factory
|
||||
, qtwebengine
|
||||
, karchive
|
||||
, poppler
|
||||
, libchardet
|
||||
, libspectre
|
||||
, openjpeg
|
||||
, djvulibre
|
||||
, qtbase
|
||||
, gtest
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
qmake,
|
||||
pkg-config,
|
||||
qttools,
|
||||
wrapQtAppsHook,
|
||||
dtkwidget,
|
||||
qt5integration,
|
||||
qt5platform-plugins,
|
||||
dde-qt-dbus-factory,
|
||||
qtwebengine,
|
||||
karchive,
|
||||
poppler,
|
||||
libchardet,
|
||||
libspectre,
|
||||
openjpeg,
|
||||
djvulibre,
|
||||
qtbase,
|
||||
gtest,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -63,9 +64,7 @@ stdenv.mkDerivation rec {
|
||||
gtest
|
||||
];
|
||||
|
||||
qmakeFlags = [
|
||||
"DEFINES+=VERSION=${version}"
|
||||
];
|
||||
qmakeFlags = [ "DEFINES+=VERSION=${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple memo software with texts and voice recordings";
|
||||
|
@ -1,27 +1,28 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, qmake
|
||||
, pkg-config
|
||||
, qttools
|
||||
, wrapQtAppsHook
|
||||
, dtkwidget
|
||||
, qt5integration
|
||||
, dde-qt-dbus-factory
|
||||
, qtbase
|
||||
, qtmultimedia
|
||||
, qtx11extras
|
||||
, image-editor
|
||||
, gsettings-qt
|
||||
, xorg
|
||||
, libusb1
|
||||
, libv4l
|
||||
, ffmpeg
|
||||
, ffmpegthumbnailer
|
||||
, portaudio
|
||||
, kwayland
|
||||
, udev
|
||||
, gst_all_1
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
qmake,
|
||||
pkg-config,
|
||||
qttools,
|
||||
wrapQtAppsHook,
|
||||
dtkwidget,
|
||||
qt5integration,
|
||||
dde-qt-dbus-factory,
|
||||
qtbase,
|
||||
qtmultimedia,
|
||||
qtx11extras,
|
||||
image-editor,
|
||||
gsettings-qt,
|
||||
xorg,
|
||||
libusb1,
|
||||
libv4l,
|
||||
ffmpeg,
|
||||
ffmpegthumbnailer,
|
||||
portaudio,
|
||||
kwayland,
|
||||
udev,
|
||||
gst_all_1,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -35,9 +36,7 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-nE+axTUxWCcgrxQ5y2cjkVswW2rwv/We0m7XgB4shko=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./dont_use_libPath.diff
|
||||
];
|
||||
patches = [ ./dont_use_libPath.diff ];
|
||||
|
||||
# disable dock plugins, it's part of dde-shell now
|
||||
postPatch = ''
|
||||
@ -57,34 +56,44 @@ stdenv.mkDerivation rec {
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
dtkwidget
|
||||
dde-qt-dbus-factory
|
||||
qtbase
|
||||
qtmultimedia
|
||||
qtx11extras
|
||||
image-editor
|
||||
gsettings-qt
|
||||
xorg.libXdmcp
|
||||
xorg.libXtst
|
||||
xorg.libXcursor
|
||||
libusb1
|
||||
libv4l
|
||||
ffmpeg
|
||||
ffmpegthumbnailer
|
||||
portaudio
|
||||
kwayland
|
||||
udev
|
||||
] ++ (with gst_all_1; [
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
]);
|
||||
buildInputs =
|
||||
[
|
||||
dtkwidget
|
||||
dde-qt-dbus-factory
|
||||
qtbase
|
||||
qtmultimedia
|
||||
qtx11extras
|
||||
image-editor
|
||||
gsettings-qt
|
||||
xorg.libXdmcp
|
||||
xorg.libXtst
|
||||
xorg.libXcursor
|
||||
libusb1
|
||||
libv4l
|
||||
ffmpeg
|
||||
ffmpegthumbnailer
|
||||
portaudio
|
||||
kwayland
|
||||
udev
|
||||
]
|
||||
++ (with gst_all_1; [
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
]);
|
||||
|
||||
# qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
|
||||
qtWrapperArgs = [
|
||||
"--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
|
||||
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev gst_all_1.gstreamer libv4l ffmpeg ffmpegthumbnailer ]}"
|
||||
"--prefix LD_LIBRARY_PATH : ${
|
||||
lib.makeLibraryPath [
|
||||
udev
|
||||
gst_all_1.gstreamer
|
||||
libv4l
|
||||
ffmpeg
|
||||
ffmpegthumbnailer
|
||||
]
|
||||
}"
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
|
@ -1,17 +1,18 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, qmake
|
||||
, qttools
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
, qtbase
|
||||
, qtx11extras
|
||||
, qtdeclarative
|
||||
, dtkwidget
|
||||
, dde-qt-dbus-factory
|
||||
, xorg
|
||||
, xscreensaver
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
qmake,
|
||||
qttools,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
qtbase,
|
||||
qtx11extras,
|
||||
qtdeclarative,
|
||||
dtkwidget,
|
||||
dde-qt-dbus-factory,
|
||||
xorg,
|
||||
xscreensaver,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -67,4 +68,3 @@ stdenv.mkDerivation rec {
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
|
||||
|
@ -1,14 +1,15 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, dtkwidget
|
||||
, qt5integration
|
||||
, qt5platform-plugins
|
||||
, qmake
|
||||
, qtbase
|
||||
, qttools
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
dtkwidget,
|
||||
qt5integration,
|
||||
qt5platform-plugins,
|
||||
qmake,
|
||||
qtbase,
|
||||
qttools,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -50,4 +51,3 @@ stdenv.mkDerivation rec {
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
|
||||
|
@ -1,29 +1,30 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, qttools
|
||||
, deepin-gettext-tools
|
||||
, wrapQtAppsHook
|
||||
, dtkwidget
|
||||
, qt5integration
|
||||
, qt5platform-plugins
|
||||
, qtbase
|
||||
, qtsvg
|
||||
, qtx11extras
|
||||
, dde-qt-dbus-factory
|
||||
, dde-dock
|
||||
, gsettings-qt
|
||||
, polkit-qt
|
||||
, procps
|
||||
, libpcap
|
||||
, libnl
|
||||
, util-linux
|
||||
, systemd
|
||||
, polkit
|
||||
, wayland
|
||||
, dwayland
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
qttools,
|
||||
deepin-gettext-tools,
|
||||
wrapQtAppsHook,
|
||||
dtkwidget,
|
||||
qt5integration,
|
||||
qt5platform-plugins,
|
||||
qtbase,
|
||||
qtsvg,
|
||||
qtx11extras,
|
||||
dde-qt-dbus-factory,
|
||||
dde-dock,
|
||||
gsettings-qt,
|
||||
polkit-qt,
|
||||
procps,
|
||||
libpcap,
|
||||
libnl,
|
||||
util-linux,
|
||||
systemd,
|
||||
polkit,
|
||||
wayland,
|
||||
dwayland,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -82,9 +83,7 @@ stdenv.mkDerivation rec {
|
||||
dwayland
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DVERSION=${version}"
|
||||
];
|
||||
cmakeFlags = [ "-DVERSION=${version}" ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
|
@ -1,20 +1,21 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, nixosTests
|
||||
, dtkwidget
|
||||
, qt5integration
|
||||
, qt5platform-plugins
|
||||
, cmake
|
||||
, qtbase
|
||||
, qtsvg
|
||||
, qttools
|
||||
, qtx11extras
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
, libsecret
|
||||
, chrpath
|
||||
, lxqt
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
nixosTests,
|
||||
dtkwidget,
|
||||
qt5integration,
|
||||
qt5platform-plugins,
|
||||
cmake,
|
||||
qtbase,
|
||||
qtsvg,
|
||||
qttools,
|
||||
qtx11extras,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
libsecret,
|
||||
chrpath,
|
||||
lxqt,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -1,37 +1,37 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, qttools
|
||||
, wrapQtAppsHook
|
||||
, qtbase
|
||||
, dtkwidget
|
||||
, qt5integration
|
||||
, qt5platform-plugins
|
||||
, qtsvg
|
||||
, dde-qt-dbus-factory
|
||||
, qtmultimedia
|
||||
, qtwebengine
|
||||
, libvlc
|
||||
, gst_all_1
|
||||
, gtest
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
qttools,
|
||||
wrapQtAppsHook,
|
||||
qtbase,
|
||||
dtkwidget,
|
||||
qt5integration,
|
||||
qt5platform-plugins,
|
||||
qtsvg,
|
||||
dde-qt-dbus-factory,
|
||||
deepin-movie-reborn,
|
||||
qtmultimedia,
|
||||
qtwebengine,
|
||||
libvlc,
|
||||
gst_all_1,
|
||||
gtest,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deepin-voice-note";
|
||||
version = "6.0.15";
|
||||
version = "6.0.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-k6LFMs2/OQQyeGI5WXBGWkAAY4GeP8LaA8hTXFwbaCM=";
|
||||
hash = "sha256-GbSYXwJoNfbg+31454GjMbXRqrtk2bSZJCk18ILfAn4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./use_v23_dbus_interface.diff
|
||||
];
|
||||
patches = [ ./use_v23_dbus_interface.diff ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
@ -47,21 +47,23 @@ stdenv.mkDerivation rec {
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtsvg
|
||||
dtkwidget
|
||||
qt5platform-plugins
|
||||
dde-qt-dbus-factory
|
||||
qtmultimedia
|
||||
qtwebengine
|
||||
libvlc
|
||||
gtest
|
||||
] ++ (with gst_all_1; [
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
]);
|
||||
buildInputs =
|
||||
[
|
||||
qtbase
|
||||
qtsvg
|
||||
dtkwidget
|
||||
qt5platform-plugins
|
||||
dde-qt-dbus-factory
|
||||
deepin-movie-reborn
|
||||
qtmultimedia
|
||||
qtwebengine
|
||||
libvlc
|
||||
gtest
|
||||
]
|
||||
++ (with gst_all_1; [
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
]);
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@ -70,18 +72,24 @@ stdenv.mkDerivation rec {
|
||||
# qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
|
||||
qtWrapperArgs = [
|
||||
"--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
|
||||
"--prefix LD_LIBRARY_PATH : ${
|
||||
lib.makeLibraryPath [
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
]
|
||||
}"
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Simple memo software with texts and voice recordings";
|
||||
mainProgram = "deepin-voice-note";
|
||||
homepage = "https://github.com/linuxdeepin/deepin-voice-note";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = lib.teams.deepin.members;
|
||||
};
|
||||
}
|
||||
|
@ -1,6 +1,7 @@
|
||||
{ stdenvNoCC
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
{
|
||||
stdenvNoCC,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
@ -19,7 +20,10 @@ stdenvNoCC.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "Account faces of deepin desktop environment";
|
||||
homepage = "https://github.com/linuxdeepin/dde-account-faces";
|
||||
license = with licenses; [ gpl3Plus cc0 ];
|
||||
license = with licenses; [
|
||||
gpl3Plus
|
||||
cc0
|
||||
];
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
|
@ -1,13 +1,14 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, gtk3
|
||||
, xcursorgen
|
||||
, papirus-icon-theme
|
||||
, breeze-icons
|
||||
, hicolor-icon-theme
|
||||
, deepin-icon-theme
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
gtk3,
|
||||
xcursorgen,
|
||||
papirus-icon-theme,
|
||||
breeze-icons,
|
||||
hicolor-icon-theme,
|
||||
deepin-icon-theme,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -47,7 +48,10 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "Provides a variety of well-designed theme resources";
|
||||
homepage = "https://github.com/linuxdeepin/deepin-desktop-theme";
|
||||
license = with licenses; [ gpl3Plus cc-by-sa-40 ];
|
||||
license = with licenses; [
|
||||
gpl3Plus
|
||||
cc-by-sa-40
|
||||
];
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
|
@ -1,7 +1,8 @@
|
||||
{ stdenvNoCC
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, gtk-engine-murrine
|
||||
{
|
||||
stdenvNoCC,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
gtk-engine-murrine,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
@ -15,9 +16,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
hash = "sha256-2B2BtbPeg3cEbnEIgdGFzy8MjCMWlbP/Sq4jzG5cjmc=";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [
|
||||
gtk-engine-murrine
|
||||
];
|
||||
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
|
||||
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
|
||||
|
@ -1,9 +1,10 @@
|
||||
{ stdenvNoCC
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, gtk3
|
||||
, xcursorgen
|
||||
, papirus-icon-theme
|
||||
{
|
||||
stdenvNoCC,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
gtk3,
|
||||
xcursorgen,
|
||||
papirus-icon-theme,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
@ -24,9 +25,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
xcursorgen
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
papirus-icon-theme
|
||||
];
|
||||
propagatedBuildInputs = [ papirus-icon-theme ];
|
||||
|
||||
dontDropIconThemeCache = true;
|
||||
|
||||
|
@ -1,6 +1,7 @@
|
||||
{ stdenvNoCC
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
{
|
||||
stdenvNoCC,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
|
@ -1,7 +1,8 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, dde-api
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
dde-api,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -36,7 +37,10 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "deepin-wallpapers provides wallpapers of dde";
|
||||
homepage = "https://github.com/linuxdeepin/deepin-wallpapers";
|
||||
license = with licenses; [ gpl3Plus cc-by-sa-30 ];
|
||||
license = with licenses; [
|
||||
gpl3Plus
|
||||
cc-by-sa-30
|
||||
];
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
|
@ -1,14 +1,15 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, dtkwidget
|
||||
, qt5integration
|
||||
, qt5platform-plugins
|
||||
, cmake
|
||||
, wrapQtAppsHook
|
||||
, qtbase
|
||||
, qttools
|
||||
, doxygen
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
dtkwidget,
|
||||
qt5integration,
|
||||
qt5platform-plugins,
|
||||
cmake,
|
||||
wrapQtAppsHook,
|
||||
qtbase,
|
||||
qttools,
|
||||
doxygen,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -1,18 +1,19 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
, qtbase
|
||||
, dtkgui
|
||||
, gsettings-qt
|
||||
, gtk3
|
||||
, kconfig
|
||||
, kwindowsystem
|
||||
, kglobalaccel
|
||||
, xorg
|
||||
, iconv
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
qtbase,
|
||||
dtkgui,
|
||||
gsettings-qt,
|
||||
gtk3,
|
||||
kconfig,
|
||||
kwindowsystem,
|
||||
kglobalaccel,
|
||||
xorg,
|
||||
iconv,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -1,10 +1,11 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, qt6Packages
|
||||
, dtk6core
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
qt6Packages,
|
||||
dtk6core,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -1,19 +1,20 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, qttools
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
, dtkwidget
|
||||
, qt5integration
|
||||
, qt5platform-plugins
|
||||
, dde-qt-dbus-factory
|
||||
, qtbase
|
||||
, qtsvg
|
||||
, libical
|
||||
, sqlite
|
||||
, runtimeShell
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
qttools,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
dtkwidget,
|
||||
qt5integration,
|
||||
qt5platform-plugins,
|
||||
dde-qt-dbus-factory,
|
||||
qtbase,
|
||||
qtsvg,
|
||||
libical,
|
||||
sqlite,
|
||||
runtimeShell,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -27,9 +28,7 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-08xkdiP0/haHY3jdHSoA1zXRxMi2t+qxLxbcRc7EO6Q=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./fix-wrapped-name-not-in-whitelist.diff
|
||||
];
|
||||
patches = [ ./fix-wrapped-name-not-in-whitelist.diff ];
|
||||
|
||||
postPatch = ''
|
||||
for file in $(grep -rl "/bin/bash"); do
|
||||
@ -68,4 +67,3 @@ stdenv.mkDerivation rec {
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
|
||||
|
@ -1,18 +1,19 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, dtkwidget
|
||||
, gio-qt
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, qttools
|
||||
, wayland
|
||||
, kwayland
|
||||
, dwayland
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
, glibmm
|
||||
, gtest
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
dtkwidget,
|
||||
gio-qt,
|
||||
cmake,
|
||||
extra-cmake-modules,
|
||||
qttools,
|
||||
wayland,
|
||||
kwayland,
|
||||
dwayland,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
glibmm,
|
||||
gtest,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -44,9 +45,7 @@ stdenv.mkDerivation rec {
|
||||
gtest
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user"
|
||||
];
|
||||
cmakeFlags = [ "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "DDE optional clipboard manager componment";
|
||||
|
@ -1,25 +1,26 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, qttools
|
||||
, doxygen
|
||||
, wrapQtAppsHook
|
||||
, wrapGAppsHook3
|
||||
, dtkwidget
|
||||
, qt5integration
|
||||
, qt5platform-plugins
|
||||
, deepin-pw-check
|
||||
, qtbase
|
||||
, qtx11extras
|
||||
, qtmultimedia
|
||||
, polkit-qt
|
||||
, libxcrypt
|
||||
, librsvg
|
||||
, gtest
|
||||
, runtimeShell
|
||||
, dbus
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
qttools,
|
||||
doxygen,
|
||||
wrapQtAppsHook,
|
||||
wrapGAppsHook3,
|
||||
dtkwidget,
|
||||
qt5integration,
|
||||
qt5platform-plugins,
|
||||
deepin-pw-check,
|
||||
qtbase,
|
||||
qtx11extras,
|
||||
qtmultimedia,
|
||||
polkit-qt,
|
||||
libxcrypt,
|
||||
librsvg,
|
||||
gtest,
|
||||
runtimeShell,
|
||||
dbus,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -89,7 +90,10 @@ stdenv.mkDerivation rec {
|
||||
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Control panel of Deepin Desktop Environment";
|
||||
|
@ -1,21 +1,22 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, qttools
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
, wrapGAppsHook3
|
||||
, qtbase
|
||||
, dtkwidget
|
||||
, qt5integration
|
||||
, qt5platform-plugins
|
||||
, dwayland
|
||||
, qtx11extras
|
||||
, gsettings-qt
|
||||
, libdbusmenu
|
||||
, xorg
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
extra-cmake-modules,
|
||||
qttools,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
wrapGAppsHook3,
|
||||
qtbase,
|
||||
dtkwidget,
|
||||
qt5integration,
|
||||
qt5platform-plugins,
|
||||
dwayland,
|
||||
qtx11extras,
|
||||
gsettings-qt,
|
||||
libdbusmenu,
|
||||
xorg,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -39,7 +40,7 @@ stdenv.mkDerivation rec {
|
||||
for file in $(grep -rl "/usr/lib/deepin-daemon"); do
|
||||
substituteInPlace $file --replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon"
|
||||
done
|
||||
'';
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
@ -65,14 +66,15 @@ stdenv.mkDerivation rec {
|
||||
xorg.libXres
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DVERSION=${version}" ];
|
||||
|
||||
# qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
|
||||
qtWrapperArgs = [
|
||||
"--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
|
||||
];
|
||||
qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" ];
|
||||
|
||||
preFixup = ''
|
||||
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
|
@ -1,44 +1,45 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, runtimeShell
|
||||
, dtkwidget
|
||||
, qt5integration
|
||||
, qt5platform-plugins
|
||||
, dde-qt-dbus-factory
|
||||
, docparser
|
||||
, dde-dock
|
||||
, cmake
|
||||
, qttools
|
||||
, qtx11extras
|
||||
, qtmultimedia
|
||||
, kcodecs
|
||||
, pkg-config
|
||||
, ffmpegthumbnailer
|
||||
, libsecret
|
||||
, libmediainfo
|
||||
, mediainfo
|
||||
, libzen
|
||||
, poppler
|
||||
, polkit-qt
|
||||
, polkit
|
||||
, wrapQtAppsHook
|
||||
, wrapGAppsHook3
|
||||
, lucenepp
|
||||
, boost
|
||||
, taglib
|
||||
, cryptsetup
|
||||
, glib
|
||||
, qtbase
|
||||
, util-dfm
|
||||
, deepin-pdfium
|
||||
, libuuid
|
||||
, libselinux
|
||||
, glibmm
|
||||
, pcre
|
||||
, udisks2
|
||||
, libisoburn
|
||||
, gsettings-qt
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
runtimeShell,
|
||||
dtkwidget,
|
||||
qt5integration,
|
||||
qt5platform-plugins,
|
||||
dde-qt-dbus-factory,
|
||||
docparser,
|
||||
dde-dock,
|
||||
cmake,
|
||||
qttools,
|
||||
qtx11extras,
|
||||
qtmultimedia,
|
||||
kcodecs,
|
||||
pkg-config,
|
||||
ffmpegthumbnailer,
|
||||
libsecret,
|
||||
libmediainfo,
|
||||
mediainfo,
|
||||
libzen,
|
||||
poppler,
|
||||
polkit-qt,
|
||||
polkit,
|
||||
wrapQtAppsHook,
|
||||
wrapGAppsHook3,
|
||||
lucenepp,
|
||||
boost,
|
||||
taglib,
|
||||
cryptsetup,
|
||||
glib,
|
||||
qtbase,
|
||||
util-dfm,
|
||||
deepin-pdfium,
|
||||
libuuid,
|
||||
libselinux,
|
||||
glibmm,
|
||||
pcre,
|
||||
udisks2,
|
||||
libisoburn,
|
||||
gsettings-qt,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -61,9 +62,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
dontWrapGApps = true;
|
||||
|
||||
patches = [
|
||||
./patch_check_v23_interface.diff
|
||||
];
|
||||
patches = [ ./patch_check_v23_interface.diff ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
@ -132,9 +131,7 @@ stdenv.mkDerivation rec {
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
|
||||
qtWrapperArgs = [
|
||||
"--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
|
||||
];
|
||||
qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" ];
|
||||
|
||||
preFixup = ''
|
||||
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
@ -148,4 +145,3 @@ stdenv.mkDerivation rec {
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
}
|
||||
|
||||
|
@ -1,21 +1,22 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, qttools
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
, dtkwidget
|
||||
, dde-qt-dbus-factory
|
||||
, dde-dock
|
||||
, deepin-pdfium
|
||||
, qt5integration
|
||||
, qt5platform-plugins
|
||||
, taglib
|
||||
, ffmpeg
|
||||
, ffmpegthumbnailer
|
||||
, pcre
|
||||
, dbus
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
qttools,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
dtkwidget,
|
||||
dde-qt-dbus-factory,
|
||||
dde-dock,
|
||||
deepin-pdfium,
|
||||
qt5integration,
|
||||
qt5platform-plugins,
|
||||
taglib,
|
||||
ffmpeg,
|
||||
ffmpegthumbnailer,
|
||||
pcre,
|
||||
dbus,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -1,17 +1,18 @@
|
||||
{ lib
|
||||
, runCommand
|
||||
, glib
|
||||
, gtk3
|
||||
, dde-grand-search
|
||||
, startdde
|
||||
, dde-session-shell
|
||||
, dde-file-manager
|
||||
, deepin-desktop-schemas
|
||||
, deepin-movie-reborn
|
||||
, deepin-system-monitor
|
||||
, gsettings-desktop-schemas
|
||||
, extraGSettingsOverrides ? ""
|
||||
, extraGSettingsOverridePackages ? [ ]
|
||||
{
|
||||
lib,
|
||||
runCommand,
|
||||
glib,
|
||||
gtk3,
|
||||
dde-grand-search,
|
||||
startdde,
|
||||
dde-session-shell,
|
||||
dde-file-manager,
|
||||
deepin-desktop-schemas,
|
||||
deepin-movie-reborn,
|
||||
deepin-system-monitor,
|
||||
gsettings-desktop-schemas,
|
||||
extraGSettingsOverrides ? "",
|
||||
extraGSettingsOverridePackages ? [ ],
|
||||
}:
|
||||
|
||||
let
|
||||
|
@ -1,13 +1,14 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, qt6Packages
|
||||
, qt6integration
|
||||
, qt6platform-plugins
|
||||
, dtk6declarative
|
||||
, dde-shell
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
qt6Packages,
|
||||
qt6integration,
|
||||
qt6platform-plugins,
|
||||
dtk6declarative,
|
||||
dde-shell,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -28,21 +29,21 @@ stdenv.mkDerivation rec {
|
||||
qt6Packages.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qt6integration
|
||||
qt6platform-plugins
|
||||
dtk6declarative
|
||||
dde-shell
|
||||
] ++ (with qt6Packages; [
|
||||
qtbase
|
||||
qtsvg
|
||||
qtwayland
|
||||
appstream-qt
|
||||
]);
|
||||
buildInputs =
|
||||
[
|
||||
qt6integration
|
||||
qt6platform-plugins
|
||||
dtk6declarative
|
||||
dde-shell
|
||||
]
|
||||
++ (with qt6Packages; [
|
||||
qtbase
|
||||
qtsvg
|
||||
qtwayland
|
||||
appstream-qt
|
||||
]);
|
||||
|
||||
cmakeFlags = [
|
||||
"-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user"
|
||||
];
|
||||
cmakeFlags = [ "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "'launcher' or 'start menu' component for DDE";
|
||||
|
@ -1,19 +1,20 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, qttools
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
, qtbase
|
||||
, qtsvg
|
||||
, dtkwidget
|
||||
, dde-dock
|
||||
, dde-control-center
|
||||
, dde-session-shell
|
||||
, networkmanager-qt
|
||||
, glib
|
||||
, gtest
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
qttools,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
qtbase,
|
||||
qtsvg,
|
||||
dtkwidget,
|
||||
dde-dock,
|
||||
dde-control-center,
|
||||
dde-session-shell,
|
||||
networkmanager-qt,
|
||||
glib,
|
||||
gtest,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -46,9 +47,7 @@ stdenv.mkDerivation rec {
|
||||
gtest
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DVERSION=${version}"
|
||||
];
|
||||
cmakeFlags = [ "-DVERSION=${version}" ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
|
@ -1,16 +1,17 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, dtkwidget
|
||||
, qt5integration
|
||||
, qt5platform-plugins
|
||||
, dde-qt-dbus-factory
|
||||
, pkg-config
|
||||
, cmake
|
||||
, qttools
|
||||
, wrapQtAppsHook
|
||||
, polkit-qt
|
||||
, qtbase
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
dtkwidget,
|
||||
qt5integration,
|
||||
qt5platform-plugins,
|
||||
dde-qt-dbus-factory,
|
||||
pkg-config,
|
||||
cmake,
|
||||
qttools,
|
||||
wrapQtAppsHook,
|
||||
polkit-qt,
|
||||
qtbase,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -39,9 +40,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
# qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
|
||||
qtWrapperArgs = [
|
||||
"--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
|
||||
];
|
||||
qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" ];
|
||||
|
||||
postFixup = ''
|
||||
wrapQtApp $out/lib/polkit-1-dde/dde-polkit-agent
|
||||
|
@ -1,26 +1,27 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, linkFarm
|
||||
, cmake
|
||||
, pkg-config
|
||||
, qttools
|
||||
, wrapQtAppsHook
|
||||
, wrapGAppsHook3
|
||||
, qtbase
|
||||
, dtkwidget
|
||||
, qt5integration
|
||||
, qt5platform-plugins
|
||||
, deepin-pw-check
|
||||
, gsettings-qt
|
||||
, lightdm_qt
|
||||
, qtx11extras
|
||||
, linux-pam
|
||||
, xorg
|
||||
, gtest
|
||||
, xkeyboard_config
|
||||
, dbus
|
||||
, dde-session-shell
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
linkFarm,
|
||||
cmake,
|
||||
pkg-config,
|
||||
qttools,
|
||||
wrapQtAppsHook,
|
||||
wrapGAppsHook3,
|
||||
qtbase,
|
||||
dtkwidget,
|
||||
qt5integration,
|
||||
qt5platform-plugins,
|
||||
deepin-pw-check,
|
||||
gsettings-qt,
|
||||
lightdm_qt,
|
||||
qtx11extras,
|
||||
linux-pam,
|
||||
xorg,
|
||||
gtest,
|
||||
xkeyboard_config,
|
||||
dbus,
|
||||
dde-session-shell,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -85,21 +86,24 @@ stdenv.mkDerivation rec {
|
||||
gtest
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
];
|
||||
|
||||
# qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
|
||||
qtWrapperArgs = [
|
||||
"--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
|
||||
];
|
||||
qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" ];
|
||||
|
||||
preFixup = ''
|
||||
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
passthru.xgreeters = linkFarm "deepin-greeter-xgreeters" [{
|
||||
path = "${dde-session-shell}/share/xgreeters/lightdm-deepin-greeter.desktop";
|
||||
name = "lightdm-deepin-greeter.desktop";
|
||||
}];
|
||||
passthru.xgreeters = linkFarm "deepin-greeter-xgreeters" [
|
||||
{
|
||||
path = "${dde-session-shell}/share/xgreeters/lightdm-deepin-greeter.desktop";
|
||||
name = "lightdm-deepin-greeter.desktop";
|
||||
}
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Deepin desktop-environment - session-shell module";
|
||||
|
@ -1,18 +1,19 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, qttools
|
||||
, wrapQtAppsHook
|
||||
, qtbase
|
||||
, dtkwidget
|
||||
, qt5integration
|
||||
, qt5platform-plugins
|
||||
, dde-dock
|
||||
, gsettings-qt
|
||||
, qtx11extras
|
||||
, gtest
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
qttools,
|
||||
wrapQtAppsHook,
|
||||
qtbase,
|
||||
dtkwidget,
|
||||
qt5integration,
|
||||
qt5platform-plugins,
|
||||
dde-dock,
|
||||
gsettings-qt,
|
||||
qtx11extras,
|
||||
gtest,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -55,14 +56,10 @@ stdenv.mkDerivation rec {
|
||||
gtest
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DDISABLE_SYS_UPDATE=ON"
|
||||
];
|
||||
cmakeFlags = [ "-DDISABLE_SYS_UPDATE=ON" ];
|
||||
|
||||
# qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
|
||||
qtWrapperArgs = [
|
||||
"--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
|
||||
];
|
||||
qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" ];
|
||||
|
||||
preFixup = ''
|
||||
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
|
@ -1,16 +1,17 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
, qtbase
|
||||
, dtkcore
|
||||
, gsettings-qt
|
||||
, libsecret
|
||||
, xorg
|
||||
, systemd
|
||||
, dde-polkit-agent
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
qtbase,
|
||||
dtkcore,
|
||||
gsettings-qt,
|
||||
libsecret,
|
||||
xorg,
|
||||
systemd,
|
||||
dde-polkit-agent,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -1,22 +1,23 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
, wayland-scanner
|
||||
, dtk6declarative
|
||||
, dtk6widget
|
||||
, dde-qt-dbus-factory
|
||||
, qt6Packages
|
||||
, qt6integration
|
||||
, qt6platform-plugins
|
||||
, kdePackages
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, yaml-cpp
|
||||
, xorg
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
extra-cmake-modules,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
wayland-scanner,
|
||||
dtk6declarative,
|
||||
dtk6widget,
|
||||
dde-qt-dbus-factory,
|
||||
qt6Packages,
|
||||
qt6integration,
|
||||
qt6platform-plugins,
|
||||
kdePackages,
|
||||
wayland,
|
||||
wayland-protocols,
|
||||
yaml-cpp,
|
||||
xorg,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@ -73,15 +74,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
env.PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";
|
||||
|
||||
cmakeFlags = [
|
||||
"-DQML_INSTALL_DIR=${placeholder "out"}/${qt6Packages.qtbase.qtQmlPrefix}"
|
||||
];
|
||||
cmakeFlags = [ "-DQML_INSTALL_DIR=${placeholder "out"}/${qt6Packages.qtbase.qtQmlPrefix}" ];
|
||||
|
||||
qtWrapperArgs = [
|
||||
# qt6integration must be placed before qtsvg in QT_PLUGIN_PATH
|
||||
"--prefix QT_PLUGIN_PATH : ${qt6integration}/${qt6Packages.qtbase.qtPluginPrefix}"
|
||||
"--suffix DDE_SHELL_PLUGIN_PATH : /run/current-system/sw/lib/dde-shell"
|
||||
"--suffix DDE_SHELL_PACKAGE_PATH : /run/current-system/sw/share/dde-shell"
|
||||
# qt6integration must be placed before qtsvg in QT_PLUGIN_PATH
|
||||
"--prefix QT_PLUGIN_PATH : ${qt6integration}/${qt6Packages.qtbase.qtPluginPrefix}"
|
||||
"--suffix DDE_SHELL_PLUGIN_PATH : /run/current-system/sw/lib/dde-shell"
|
||||
"--suffix DDE_SHELL_PACKAGE_PATH : /run/current-system/sw/share/dde-shell"
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
@ -1,15 +1,16 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, dde-qt-dbus-factory
|
||||
, wrapQtAppsHook
|
||||
, qtbase
|
||||
, qtx11extras
|
||||
, dtkwidget
|
||||
, qt5integration
|
||||
, gtest
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
dde-qt-dbus-factory,
|
||||
wrapQtAppsHook,
|
||||
qtbase,
|
||||
qtx11extras,
|
||||
dtkwidget,
|
||||
qt5integration,
|
||||
gtest,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -1,37 +1,38 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, wayland
|
||||
, dwayland
|
||||
, qtbase
|
||||
, qttools
|
||||
, qtx11extras
|
||||
, wrapQtAppsHook
|
||||
, extra-cmake-modules
|
||||
, gsettings-qt
|
||||
, libepoxy
|
||||
, kconfig
|
||||
, kconfigwidgets
|
||||
, kcoreaddons
|
||||
, kcrash
|
||||
, kdbusaddons
|
||||
, kiconthemes
|
||||
, kglobalaccel
|
||||
, kidletime
|
||||
, knotifications
|
||||
, kpackage
|
||||
, plasma-framework
|
||||
, kcmutils
|
||||
, knewstuff
|
||||
, kdecoration
|
||||
, kscreenlocker
|
||||
, breeze-qt5
|
||||
, libinput
|
||||
, mesa
|
||||
, lcms2
|
||||
, xorg
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
wayland,
|
||||
dwayland,
|
||||
qtbase,
|
||||
qttools,
|
||||
qtx11extras,
|
||||
wrapQtAppsHook,
|
||||
extra-cmake-modules,
|
||||
gsettings-qt,
|
||||
libepoxy,
|
||||
kconfig,
|
||||
kconfigwidgets,
|
||||
kcoreaddons,
|
||||
kcrash,
|
||||
kdbusaddons,
|
||||
kiconthemes,
|
||||
kglobalaccel,
|
||||
kidletime,
|
||||
knotifications,
|
||||
kpackage,
|
||||
plasma-framework,
|
||||
kcmutils,
|
||||
knewstuff,
|
||||
kdecoration,
|
||||
kscreenlocker,
|
||||
breeze-qt5,
|
||||
libinput,
|
||||
mesa,
|
||||
lcms2,
|
||||
xorg,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -45,9 +46,7 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-EjPPjdxa+iL/nXhuccoM3NiLmGXh7Un2aGz8O3sP6xE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0001-hardcode-fallback-background.diff
|
||||
];
|
||||
patches = [ ./0001-hardcode-fallback-background.diff ];
|
||||
|
||||
# Avoid using absolute path to distinguish applications
|
||||
postPatch = ''
|
||||
@ -101,11 +100,12 @@ stdenv.mkDerivation rec {
|
||||
xorg.libXScrnSaver
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DKWIN_BUILD_RUNNERS=OFF"
|
||||
];
|
||||
cmakeFlags = [ "-DKWIN_BUILD_RUNNERS=OFF" ];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fork of kwin, an easy to use, but flexible, composited Window Manager";
|
||||
|
@ -1,9 +1,10 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -1,14 +1,15 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, qttools
|
||||
, wrapQtAppsHook
|
||||
, dtkwidget
|
||||
, dde-polkit-agent
|
||||
, qt5integration
|
||||
, libsecret
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
qttools,
|
||||
wrapQtAppsHook,
|
||||
dtkwidget,
|
||||
dde-polkit-agent,
|
||||
qt5integration,
|
||||
libsecret,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -1,110 +1,118 @@
|
||||
{ lib, pkgs, config, libsForQt5 }:
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
config,
|
||||
libsForQt5,
|
||||
}:
|
||||
let
|
||||
packages = self:
|
||||
let
|
||||
inherit (self) callPackage;
|
||||
in {
|
||||
#### LIBRARIES
|
||||
dtkcommon = callPackage ./library/dtkcommon { };
|
||||
dtkcore = callPackage ./library/dtkcore { };
|
||||
dtkgui = callPackage ./library/dtkgui { };
|
||||
dtkwidget = callPackage ./library/dtkwidget { };
|
||||
dtkdeclarative = callPackage ./library/dtkdeclarative { };
|
||||
dtklog = callPackage ./library/dtklog { };
|
||||
deepin-pdfium = callPackage ./library/deepin-pdfium { };
|
||||
qt5platform-plugins = callPackage ./library/qt5platform-plugins { };
|
||||
qt5integration = callPackage ./library/qt5integration { };
|
||||
deepin-wayland-protocols = callPackage ./library/deepin-wayland-protocols { };
|
||||
deepin-ocr-plugin-manager = callPackage ./library/deepin-ocr-plugin-manager { };
|
||||
dwayland = callPackage ./library/dwayland { };
|
||||
dde-qt-dbus-factory = callPackage ./library/dde-qt-dbus-factory { };
|
||||
disomaster = callPackage ./library/disomaster { };
|
||||
docparser = callPackage ./library/docparser { };
|
||||
gio-qt = callPackage ./library/gio-qt { };
|
||||
image-editor = callPackage ./library/image-editor { };
|
||||
udisks2-qt5 = callPackage ./library/udisks2-qt5 { };
|
||||
util-dfm = callPackage ./library/util-dfm { };
|
||||
dtk6core = callPackage ./library/dtk6core { };
|
||||
dtk6gui = callPackage ./library/dtk6gui { };
|
||||
dtk6widget = callPackage ./library/dtk6widget { };
|
||||
dtk6declarative = callPackage ./library/dtk6declarative { };
|
||||
dtk6systemsettings = callPackage ./library/dtk6systemsettings { };
|
||||
dtk6log = callPackage ./library/dtk6log { };
|
||||
qt6platform-plugins = callPackage ./library/qt6platform-plugins { };
|
||||
qt6integration = callPackage ./library/qt6integration { };
|
||||
packages =
|
||||
self:
|
||||
let
|
||||
inherit (self) callPackage;
|
||||
in
|
||||
{
|
||||
#### LIBRARIES
|
||||
dtkcommon = callPackage ./library/dtkcommon { };
|
||||
dtkcore = callPackage ./library/dtkcore { };
|
||||
dtkgui = callPackage ./library/dtkgui { };
|
||||
dtkwidget = callPackage ./library/dtkwidget { };
|
||||
dtkdeclarative = callPackage ./library/dtkdeclarative { };
|
||||
dtklog = callPackage ./library/dtklog { };
|
||||
deepin-pdfium = callPackage ./library/deepin-pdfium { };
|
||||
qt5platform-plugins = callPackage ./library/qt5platform-plugins { };
|
||||
qt5integration = callPackage ./library/qt5integration { };
|
||||
deepin-wayland-protocols = callPackage ./library/deepin-wayland-protocols { };
|
||||
deepin-ocr-plugin-manager = callPackage ./library/deepin-ocr-plugin-manager { };
|
||||
dwayland = callPackage ./library/dwayland { };
|
||||
dde-qt-dbus-factory = callPackage ./library/dde-qt-dbus-factory { };
|
||||
disomaster = callPackage ./library/disomaster { };
|
||||
docparser = callPackage ./library/docparser { };
|
||||
gio-qt = callPackage ./library/gio-qt { };
|
||||
image-editor = callPackage ./library/image-editor { };
|
||||
udisks2-qt5 = callPackage ./library/udisks2-qt5 { };
|
||||
util-dfm = callPackage ./library/util-dfm { };
|
||||
dtk6core = callPackage ./library/dtk6core { };
|
||||
dtk6gui = callPackage ./library/dtk6gui { };
|
||||
dtk6widget = callPackage ./library/dtk6widget { };
|
||||
dtk6declarative = callPackage ./library/dtk6declarative { };
|
||||
dtk6systemsettings = callPackage ./library/dtk6systemsettings { };
|
||||
dtk6log = callPackage ./library/dtk6log { };
|
||||
qt6platform-plugins = callPackage ./library/qt6platform-plugins { };
|
||||
qt6integration = callPackage ./library/qt6integration { };
|
||||
|
||||
#### CORE
|
||||
deepin-kwin = callPackage ./core/deepin-kwin { };
|
||||
dde-appearance = callPackage ./core/dde-appearance { };
|
||||
dde-app-services = callPackage ./core/dde-app-services { };
|
||||
dde-application-manager = callPackage ./core/dde-application-manager { };
|
||||
dde-control-center = callPackage ./core/dde-control-center { };
|
||||
dde-calendar = callPackage ./core/dde-calendar { };
|
||||
dde-clipboard = callPackage ./core/dde-clipboard { };
|
||||
dde-dock = callPackage ./core/dde-dock { };
|
||||
dde-file-manager = callPackage ./core/dde-file-manager { };
|
||||
dde-launchpad = callPackage ./core/dde-launchpad { };
|
||||
dde-network-core = callPackage ./core/dde-network-core { };
|
||||
dde-session = callPackage ./core/dde-session { };
|
||||
dde-session-shell = callPackage ./core/dde-session-shell { };
|
||||
dde-session-ui = callPackage ./core/dde-session-ui { };
|
||||
deepin-service-manager = callPackage ./core/deepin-service-manager { };
|
||||
dde-polkit-agent = callPackage ./core/dde-polkit-agent { };
|
||||
dpa-ext-gnomekeyring = callPackage ./core/dpa-ext-gnomekeyring { };
|
||||
dde-gsettings-schemas = callPackage ./core/dde-gsettings-schemas { };
|
||||
dde-widgets = callPackage ./core/dde-widgets { };
|
||||
dde-shell = callPackage ./core/dde-shell { };
|
||||
dde-grand-search = callPackage ./core/dde-grand-search { };
|
||||
#### CORE
|
||||
deepin-kwin = callPackage ./core/deepin-kwin { };
|
||||
dde-appearance = callPackage ./core/dde-appearance { };
|
||||
dde-app-services = callPackage ./core/dde-app-services { };
|
||||
dde-application-manager = callPackage ./core/dde-application-manager { };
|
||||
dde-control-center = callPackage ./core/dde-control-center { };
|
||||
dde-calendar = callPackage ./core/dde-calendar { };
|
||||
dde-clipboard = callPackage ./core/dde-clipboard { };
|
||||
dde-dock = callPackage ./core/dde-dock { };
|
||||
dde-file-manager = callPackage ./core/dde-file-manager { };
|
||||
dde-launchpad = callPackage ./core/dde-launchpad { };
|
||||
dde-network-core = callPackage ./core/dde-network-core { };
|
||||
dde-session = callPackage ./core/dde-session { };
|
||||
dde-session-shell = callPackage ./core/dde-session-shell { };
|
||||
dde-session-ui = callPackage ./core/dde-session-ui { };
|
||||
deepin-service-manager = callPackage ./core/deepin-service-manager { };
|
||||
dde-polkit-agent = callPackage ./core/dde-polkit-agent { };
|
||||
dpa-ext-gnomekeyring = callPackage ./core/dpa-ext-gnomekeyring { };
|
||||
dde-gsettings-schemas = callPackage ./core/dde-gsettings-schemas { };
|
||||
dde-widgets = callPackage ./core/dde-widgets { };
|
||||
dde-shell = callPackage ./core/dde-shell { };
|
||||
dde-grand-search = callPackage ./core/dde-grand-search { };
|
||||
|
||||
#### Dtk Application
|
||||
deepin-album = callPackage ./apps/deepin-album { };
|
||||
deepin-calculator = callPackage ./apps/deepin-calculator { };
|
||||
deepin-camera = callPackage ./apps/deepin-camera { };
|
||||
deepin-compressor = callPackage ./apps/deepin-compressor { };
|
||||
deepin-draw = callPackage ./apps/deepin-draw { };
|
||||
deepin-editor = callPackage ./apps/deepin-editor { };
|
||||
deepin-image-viewer = callPackage ./apps/deepin-image-viewer { };
|
||||
deepin-movie-reborn = callPackage ./apps/deepin-movie-reborn { };
|
||||
deepin-music = callPackage ./apps/deepin-music { };
|
||||
deepin-picker = callPackage ./apps/deepin-picker { };
|
||||
deepin-screen-recorder = callPackage ./apps/deepin-screen-recorder { };
|
||||
deepin-shortcut-viewer = callPackage ./apps/deepin-shortcut-viewer { };
|
||||
deepin-system-monitor = callPackage ./apps/deepin-system-monitor { };
|
||||
deepin-terminal = callPackage ./apps/deepin-terminal { };
|
||||
deepin-reader = callPackage ./apps/deepin-reader { };
|
||||
deepin-voice-note = callPackage ./apps/deepin-voice-note { };
|
||||
deepin-screensaver = callPackage ./apps/deepin-screensaver { };
|
||||
#### Dtk Application
|
||||
deepin-album = callPackage ./apps/deepin-album { };
|
||||
deepin-calculator = callPackage ./apps/deepin-calculator { };
|
||||
deepin-camera = callPackage ./apps/deepin-camera { };
|
||||
deepin-compressor = callPackage ./apps/deepin-compressor { };
|
||||
deepin-draw = callPackage ./apps/deepin-draw { };
|
||||
deepin-editor = callPackage ./apps/deepin-editor { };
|
||||
deepin-image-viewer = callPackage ./apps/deepin-image-viewer { };
|
||||
deepin-movie-reborn = callPackage ./apps/deepin-movie-reborn { };
|
||||
deepin-music = callPackage ./apps/deepin-music { };
|
||||
deepin-picker = callPackage ./apps/deepin-picker { };
|
||||
deepin-screen-recorder = callPackage ./apps/deepin-screen-recorder { };
|
||||
deepin-shortcut-viewer = callPackage ./apps/deepin-shortcut-viewer { };
|
||||
deepin-system-monitor = callPackage ./apps/deepin-system-monitor { };
|
||||
deepin-terminal = callPackage ./apps/deepin-terminal { };
|
||||
deepin-reader = callPackage ./apps/deepin-reader { };
|
||||
deepin-voice-note = callPackage ./apps/deepin-voice-note { };
|
||||
deepin-screensaver = callPackage ./apps/deepin-screensaver { };
|
||||
|
||||
#### Go Packages
|
||||
dde-api = callPackage ./go-package/dde-api { };
|
||||
dde-daemon = callPackage ./go-package/dde-daemon { };
|
||||
deepin-pw-check = callPackage ./go-package/deepin-pw-check { };
|
||||
deepin-desktop-schemas = callPackage ./go-package/deepin-desktop-schemas { };
|
||||
startdde = callPackage ./go-package/startdde { };
|
||||
#### Go Packages
|
||||
dde-api = callPackage ./go-package/dde-api { };
|
||||
dde-daemon = callPackage ./go-package/dde-daemon { };
|
||||
deepin-pw-check = callPackage ./go-package/deepin-pw-check { };
|
||||
deepin-desktop-schemas = callPackage ./go-package/deepin-desktop-schemas { };
|
||||
startdde = callPackage ./go-package/startdde { };
|
||||
|
||||
#### TOOLS
|
||||
dde-device-formatter = callPackage ./tools/dde-device-formatter { };
|
||||
deepin-gettext-tools = callPackage ./tools/deepin-gettext-tools { };
|
||||
deepin-anything = callPackage ./tools/deepin-anything { };
|
||||
#### TOOLS
|
||||
dde-device-formatter = callPackage ./tools/dde-device-formatter { };
|
||||
deepin-gettext-tools = callPackage ./tools/deepin-gettext-tools { };
|
||||
deepin-anything = callPackage ./tools/deepin-anything { };
|
||||
|
||||
#### ARTWORK
|
||||
dde-account-faces = callPackage ./artwork/dde-account-faces { };
|
||||
deepin-icon-theme = callPackage ./artwork/deepin-icon-theme { };
|
||||
deepin-wallpapers = callPackage ./artwork/deepin-wallpapers { };
|
||||
deepin-gtk-theme = callPackage ./artwork/deepin-gtk-theme { };
|
||||
deepin-sound-theme = callPackage ./artwork/deepin-sound-theme { };
|
||||
deepin-desktop-theme = callPackage ./artwork/deepin-desktop-theme { };
|
||||
#### ARTWORK
|
||||
dde-account-faces = callPackage ./artwork/dde-account-faces { };
|
||||
deepin-icon-theme = callPackage ./artwork/deepin-icon-theme { };
|
||||
deepin-wallpapers = callPackage ./artwork/deepin-wallpapers { };
|
||||
deepin-gtk-theme = callPackage ./artwork/deepin-gtk-theme { };
|
||||
deepin-sound-theme = callPackage ./artwork/deepin-sound-theme { };
|
||||
deepin-desktop-theme = callPackage ./artwork/deepin-desktop-theme { };
|
||||
|
||||
#### MISC
|
||||
deepin-desktop-base = callPackage ./misc/deepin-desktop-base { };
|
||||
deepin-turbo = callPackage ./misc/deepin-turbo { };
|
||||
} // lib.optionalAttrs config.allowAliases {
|
||||
dde-kwin = throw "The 'deepin.dde-kwin' package was removed as it is outdated and no longer relevant."; # added 2023-09-27
|
||||
dde-launcher = throw "The 'deepin.dde-launcher' is no longer maintained. Please use 'deepin.dde-launchpad' instead."; # added 2023-11-23
|
||||
deepin-clone = throw "The 'deepin.deepin-clone' package was removed as it is broken and unmaintained."; # added 2024-08-23
|
||||
go-lib = throw "Then 'deepin.go-lib' package was removed, use 'go mod' to manage it"; # added 2024-05-31
|
||||
go-gir-generator = throw "Then 'deepin.go-gir-generator' package was removed, use 'go mod' to manage it"; # added 2024-05-31
|
||||
go-dbus-factory = throw "Then 'deepin.go-dbus-factory' package was removed, use 'go mod' to manage it"; # added 2024-05-31
|
||||
};
|
||||
#### MISC
|
||||
deepin-desktop-base = callPackage ./misc/deepin-desktop-base { };
|
||||
deepin-turbo = callPackage ./misc/deepin-turbo { };
|
||||
}
|
||||
// lib.optionalAttrs config.allowAliases {
|
||||
dde-kwin = throw "The 'deepin.dde-kwin' package was removed as it is outdated and no longer relevant."; # added 2023-09-27
|
||||
dde-launcher = throw "The 'deepin.dde-launcher' is no longer maintained. Please use 'deepin.dde-launchpad' instead."; # added 2023-11-23
|
||||
deepin-clone = throw "The 'deepin.deepin-clone' package was removed as it is broken and unmaintained."; # added 2024-08-23
|
||||
go-lib = throw "Then 'deepin.go-lib' package was removed, use 'go mod' to manage it"; # added 2024-05-31
|
||||
go-gir-generator = throw "Then 'deepin.go-gir-generator' package was removed, use 'go mod' to manage it"; # added 2024-05-31
|
||||
go-dbus-factory = throw "Then 'deepin.go-dbus-factory' package was removed, use 'go mod' to manage it"; # added 2024-05-31
|
||||
};
|
||||
in
|
||||
lib.makeScope libsForQt5.newScope packages
|
||||
|
@ -1,20 +1,21 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildGoModule
|
||||
, pkg-config
|
||||
, deepin-gettext-tools
|
||||
, wrapQtAppsHook
|
||||
, wrapGAppsHook3
|
||||
, alsa-lib
|
||||
, gtk3
|
||||
, libcanberra
|
||||
, libgudev
|
||||
, librsvg
|
||||
, poppler
|
||||
, pulseaudio
|
||||
, gdk-pixbuf-xlib
|
||||
, coreutils
|
||||
, dbus
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildGoModule,
|
||||
pkg-config,
|
||||
deepin-gettext-tools,
|
||||
wrapQtAppsHook,
|
||||
wrapGAppsHook3,
|
||||
alsa-lib,
|
||||
gtk3,
|
||||
libcanberra,
|
||||
libgudev,
|
||||
librsvg,
|
||||
poppler,
|
||||
pulseaudio,
|
||||
gdk-pixbuf-xlib,
|
||||
coreutils,
|
||||
dbus,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
|
@ -1,38 +1,39 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, substituteAll
|
||||
, buildGoModule
|
||||
, pkg-config
|
||||
, deepin-gettext-tools
|
||||
, gettext
|
||||
, python3
|
||||
, wrapGAppsHook3
|
||||
, ddcutil
|
||||
, alsa-lib
|
||||
, glib
|
||||
, gtk3
|
||||
, libgudev
|
||||
, libinput
|
||||
, libnl
|
||||
, librsvg
|
||||
, linux-pam
|
||||
, libxcrypt
|
||||
, networkmanager
|
||||
, pulseaudio
|
||||
, gdk-pixbuf-xlib
|
||||
, tzdata
|
||||
, xkeyboard_config
|
||||
, runtimeShell
|
||||
, xorg
|
||||
, xdotool
|
||||
, getconf
|
||||
, dbus
|
||||
, util-linux
|
||||
, dde-session-ui
|
||||
, coreutils
|
||||
, lshw
|
||||
, dmidecode
|
||||
, systemd
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
substituteAll,
|
||||
buildGoModule,
|
||||
pkg-config,
|
||||
deepin-gettext-tools,
|
||||
gettext,
|
||||
python3,
|
||||
wrapGAppsHook3,
|
||||
ddcutil,
|
||||
alsa-lib,
|
||||
glib,
|
||||
gtk3,
|
||||
libgudev,
|
||||
libinput,
|
||||
libnl,
|
||||
librsvg,
|
||||
linux-pam,
|
||||
libxcrypt,
|
||||
networkmanager,
|
||||
pulseaudio,
|
||||
gdk-pixbuf-xlib,
|
||||
tzdata,
|
||||
xkeyboard_config,
|
||||
runtimeShell,
|
||||
xorg,
|
||||
xdotool,
|
||||
getconf,
|
||||
dbus,
|
||||
util-linux,
|
||||
dde-session-ui,
|
||||
coreutils,
|
||||
lshw,
|
||||
dmidecode,
|
||||
systemd,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
@ -133,7 +134,16 @@ buildGoModule rec {
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix PATH : "${lib.makeBinPath [ util-linux dde-session-ui glib lshw dmidecode systemd ]}"
|
||||
--prefix PATH : "${
|
||||
lib.makeBinPath [
|
||||
util-linux
|
||||
dde-session-ui
|
||||
glib
|
||||
lshw
|
||||
dmidecode
|
||||
systemd
|
||||
]
|
||||
}"
|
||||
)
|
||||
'';
|
||||
|
||||
|
@ -1,8 +1,9 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, glib
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
glib,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
|
@ -1,15 +1,16 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildGoModule
|
||||
, pkg-config
|
||||
, deepin-gettext-tools
|
||||
, gtk3
|
||||
, glib
|
||||
, libxcrypt
|
||||
, gettext
|
||||
, iniparser
|
||||
, cracklib
|
||||
, linux-pam
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildGoModule,
|
||||
pkg-config,
|
||||
deepin-gettext-tools,
|
||||
gtk3,
|
||||
glib,
|
||||
libxcrypt,
|
||||
gettext,
|
||||
iniparser,
|
||||
cracklib,
|
||||
linux-pam,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
@ -23,9 +24,7 @@ buildGoModule rec {
|
||||
hash = "sha256-kBrkcB0IWGUV4ZrkFzwdPglRgDcnVvYDFhTXS20pKOk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
"${src}/rpm/0001-Mangle-Suit-Cracklib2.9.6.patch"
|
||||
];
|
||||
patches = [ "${src}/rpm/0001-Mangle-Suit-Cracklib2.9.6.patch" ];
|
||||
|
||||
vendorHash = "sha256-L0vUEkUN70Hrx5roIvTfaZBHbbq7mf3WpQJeFAMU5HY=";
|
||||
|
||||
|
@ -1,19 +1,20 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, gettext
|
||||
, pkg-config
|
||||
, jq
|
||||
, wrapGAppsHook3
|
||||
, glib
|
||||
, libgnome-keyring
|
||||
, gtk3
|
||||
, alsa-lib
|
||||
, pulseaudio
|
||||
, libgudev
|
||||
, libsecret
|
||||
, runtimeShell
|
||||
, dbus
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
gettext,
|
||||
pkg-config,
|
||||
jq,
|
||||
wrapGAppsHook3,
|
||||
glib,
|
||||
libgnome-keyring,
|
||||
gtk3,
|
||||
alsa-lib,
|
||||
pulseaudio,
|
||||
libgudev,
|
||||
libsecret,
|
||||
runtimeShell,
|
||||
dbus,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
|
@ -1,11 +1,12 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, qmake
|
||||
, qtbase
|
||||
, wrapQtAppsHook
|
||||
, python3
|
||||
, dtkcore
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
qmake,
|
||||
qtbase,
|
||||
wrapQtAppsHook,
|
||||
python3,
|
||||
dtkcore,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -1,14 +1,15 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, cmake
|
||||
, qttools
|
||||
, wrapQtAppsHook
|
||||
, libisoburn
|
||||
, ncnn
|
||||
, opencv
|
||||
, vulkan-headers
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
cmake,
|
||||
qttools,
|
||||
wrapQtAppsHook,
|
||||
libisoburn,
|
||||
ncnn,
|
||||
opencv,
|
||||
vulkan-headers,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -1,11 +1,12 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, qmake
|
||||
, pkg-config
|
||||
, libchardet
|
||||
, lcms2
|
||||
, openjpeg
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
qmake,
|
||||
pkg-config,
|
||||
libchardet,
|
||||
lcms2,
|
||||
openjpeg,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -1,8 +1,9 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
extra-cmake-modules,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -1,11 +1,12 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, qmake
|
||||
, qttools
|
||||
, wrapQtAppsHook
|
||||
, libisoburn
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
qmake,
|
||||
qttools,
|
||||
wrapQtAppsHook,
|
||||
libisoburn,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -1,11 +1,12 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, qmake
|
||||
, qttools
|
||||
, wrapQtAppsHook
|
||||
, poppler
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
qmake,
|
||||
qttools,
|
||||
wrapQtAppsHook,
|
||||
poppler,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -1,14 +1,15 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, doxygen
|
||||
, qt6Packages
|
||||
, lshw
|
||||
, libuchardet
|
||||
, dtkcommon
|
||||
, dtk6log
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
doxygen,
|
||||
qt6Packages,
|
||||
lshw,
|
||||
libuchardet,
|
||||
dtkcommon,
|
||||
dtk6log,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@ -48,7 +49,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libuchardet
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ dtkcommon dtk6log ];
|
||||
propagatedBuildInputs = [
|
||||
dtkcommon
|
||||
dtk6log
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DDTK_VERSION=${finalAttrs.version}"
|
||||
@ -66,7 +70,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix}
|
||||
'';
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
"doc"
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
for binary in $out/libexec/dtk6/DCore/bin/*; do
|
||||
|
@ -1,11 +1,12 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, doxygen
|
||||
, qt6Packages
|
||||
, dtk6gui
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
doxygen,
|
||||
qt6Packages,
|
||||
dtk6gui,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@ -32,14 +33,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
qt6Packages.wrapQtAppsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dtk6gui
|
||||
] ++ (with qt6Packages ; [
|
||||
qtbase
|
||||
qtdeclarative
|
||||
qtshadertools
|
||||
qt5compat
|
||||
]);
|
||||
propagatedBuildInputs =
|
||||
[ dtk6gui ]
|
||||
++ (with qt6Packages; [
|
||||
qtbase
|
||||
qtdeclarative
|
||||
qtshadertools
|
||||
qt5compat
|
||||
]);
|
||||
|
||||
cmakeFlags = [
|
||||
"-DDTK_VERSION=${finalAttrs.version}"
|
||||
@ -57,7 +58,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
export QML2_IMPORT_PATH=${lib.getBin qt6Packages.qtdeclarative}/${qt6Packages.qtbase.qtQmlPrefix}
|
||||
'';
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
"doc"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Widget development toolkit based on QtQuick/QtQml";
|
||||
|
@ -1,12 +1,13 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, doxygen
|
||||
, qt6Packages
|
||||
, dtk6core
|
||||
, librsvg
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
doxygen,
|
||||
qt6Packages,
|
||||
dtk6core,
|
||||
librsvg,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@ -56,7 +57,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix}
|
||||
'';
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
"doc"
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
for binary in $out/libexec/dtk6/DGui/bin/*; do
|
||||
|
@ -1,12 +1,13 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, doxygen
|
||||
, qt6Packages
|
||||
, dtk6core
|
||||
, libxcrypt
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
doxygen,
|
||||
qt6Packages,
|
||||
dtk6core,
|
||||
libxcrypt,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -50,7 +51,11 @@ stdenv.mkDerivation rec {
|
||||
export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix}
|
||||
'';
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
"doc"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Qt-based development library for system settings";
|
||||
|
@ -1,13 +1,14 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, doxygen
|
||||
, qt6Packages
|
||||
, dtk6gui
|
||||
, cups
|
||||
, libstartup_notification
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
doxygen,
|
||||
qt6Packages,
|
||||
dtk6gui,
|
||||
cups,
|
||||
libstartup_notification,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@ -40,14 +41,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
qt6Packages.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
cups
|
||||
libstartup_notification
|
||||
] ++ (with qt6Packages; [
|
||||
qtbase
|
||||
qtmultimedia
|
||||
qtsvg
|
||||
]);
|
||||
buildInputs =
|
||||
[
|
||||
cups
|
||||
libstartup_notification
|
||||
]
|
||||
++ (with qt6Packages; [
|
||||
qtbase
|
||||
qtmultimedia
|
||||
qtsvg
|
||||
]);
|
||||
|
||||
propagatedBuildInputs = [ dtk6gui ];
|
||||
|
||||
@ -64,7 +67,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix}
|
||||
'';
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
"doc"
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
for binary in $out/lib/dtk6/DWidget/bin/*; do
|
||||
|
@ -1,7 +1,8 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -15,9 +16,7 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-e+8kG9bB6iby2RgD8jn75GyefLRHNnjD+n04hXbi5ec=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
|
@ -1,15 +1,16 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, doxygen
|
||||
, libsForQt5
|
||||
, gsettings-qt
|
||||
, lshw
|
||||
, libuchardet
|
||||
, dtkcommon
|
||||
, dtklog
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
doxygen,
|
||||
libsForQt5,
|
||||
gsettings-qt,
|
||||
lshw,
|
||||
libuchardet,
|
||||
dtkcommon,
|
||||
dtklog,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -50,7 +51,10 @@ stdenv.mkDerivation rec {
|
||||
libuchardet
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ dtkcommon dtklog ];
|
||||
propagatedBuildInputs = [
|
||||
dtkcommon
|
||||
dtklog
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DDTK_VERSION=${version}"
|
||||
@ -69,7 +73,11 @@ stdenv.mkDerivation rec {
|
||||
export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix}
|
||||
'';
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
"doc"
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
for binary in $out/libexec/dtk5/DCore/bin/*; do
|
||||
|
@ -1,11 +1,12 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, doxygen
|
||||
, libsForQt5
|
||||
, dtkgui
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
doxygen,
|
||||
libsForQt5,
|
||||
dtkgui,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -55,7 +56,11 @@ stdenv.mkDerivation rec {
|
||||
export QML2_IMPORT_PATH=${libsForQt5.qtdeclarative.bin}/${libsForQt5.qtbase.qtQmlPrefix}
|
||||
'';
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
"doc"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Widget development toolkit based on QtQuick/QtQml";
|
||||
|
@ -1,13 +1,14 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, cmake
|
||||
, doxygen
|
||||
, libsForQt5
|
||||
, dtkcore
|
||||
, lxqt
|
||||
, librsvg
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
cmake,
|
||||
doxygen,
|
||||
libsForQt5,
|
||||
dtkcore,
|
||||
lxqt,
|
||||
librsvg,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -58,7 +59,11 @@ stdenv.mkDerivation rec {
|
||||
export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix}
|
||||
'';
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
"doc"
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
for binary in $out/libexec/dtk5/DGui/bin/*; do
|
||||
|
@ -1,15 +1,16 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, doxygen
|
||||
, libsForQt5
|
||||
, dtkgui
|
||||
, cups
|
||||
, gsettings-qt
|
||||
, libstartup_notification
|
||||
, xorg
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
doxygen,
|
||||
libsForQt5,
|
||||
dtkgui,
|
||||
cups,
|
||||
gsettings-qt,
|
||||
libstartup_notification,
|
||||
xorg,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -68,7 +69,11 @@ stdenv.mkDerivation rec {
|
||||
export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix}
|
||||
'';
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
"doc"
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
for binary in $out/lib/dtk5/DWidget/bin/*; do
|
||||
|
@ -1,15 +1,16 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, qtbase
|
||||
, qtwayland
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, wayland-scanner
|
||||
, extra-cmake-modules
|
||||
, deepin-wayland-protocols
|
||||
, qttools
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
qtbase,
|
||||
qtwayland,
|
||||
wayland,
|
||||
wayland-protocols,
|
||||
wayland-scanner,
|
||||
extra-cmake-modules,
|
||||
deepin-wayland-protocols,
|
||||
qttools,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -42,7 +43,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# cmake requires that the kf5 directory must not empty
|
||||
postInstall = ''
|
||||
mkdir $out/include/KF5
|
||||
mkdir $out/include/KF5
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -1,14 +1,15 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
, glibmm
|
||||
, doxygen
|
||||
, qttools
|
||||
, qtbase
|
||||
, buildDocs ? true
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
glibmm,
|
||||
doxygen,
|
||||
qttools,
|
||||
qtbase,
|
||||
buildDocs ? true,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -29,11 +30,16 @@ stdenv.mkDerivation rec {
|
||||
--replace "include(qt6.cmake)" " "
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
] ++ lib.optionals buildDocs [ doxygen qttools.dev ];
|
||||
nativeBuildInputs =
|
||||
[
|
||||
cmake
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
]
|
||||
++ lib.optionals buildDocs [
|
||||
doxygen
|
||||
qttools.dev
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||
|
@ -1,16 +1,17 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, dtkwidget
|
||||
, cmake
|
||||
, qttools
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
, opencv
|
||||
, freeimage
|
||||
, libmediainfo
|
||||
, ffmpegthumbnailer
|
||||
, pcre
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
dtkwidget,
|
||||
cmake,
|
||||
qttools,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
opencv,
|
||||
freeimage,
|
||||
libmediainfo,
|
||||
ffmpegthumbnailer,
|
||||
pcre,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -29,7 +30,12 @@ stdenv.mkDerivation rec {
|
||||
substituteInPlace libimagevisualresult/CMakeLists.txt --replace '/usr' '$out'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
qttools
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
dtkwidget
|
||||
@ -40,9 +46,7 @@ stdenv.mkDerivation rec {
|
||||
pcre
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||
];
|
||||
cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Image editor lib for dtk";
|
||||
|
@ -1,14 +1,15 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, dtkwidget
|
||||
, cmake
|
||||
, pkg-config
|
||||
, libsForQt5
|
||||
, lxqt
|
||||
, mtdev
|
||||
, xorg
|
||||
, gtest
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
dtkwidget,
|
||||
cmake,
|
||||
pkg-config,
|
||||
libsForQt5,
|
||||
lxqt,
|
||||
mtdev,
|
||||
xorg,
|
||||
gtest,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -1,16 +1,17 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, pkg-config
|
||||
, dtkcommon
|
||||
, libsForQt5
|
||||
, mtdev
|
||||
, cairo
|
||||
, xorg
|
||||
, wayland
|
||||
, dwayland
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
extra-cmake-modules,
|
||||
pkg-config,
|
||||
dtkcommon,
|
||||
libsForQt5,
|
||||
mtdev,
|
||||
cairo,
|
||||
xorg,
|
||||
wayland,
|
||||
dwayland,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -1,11 +1,12 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, dtk6widget
|
||||
, qt6Packages
|
||||
, gtest
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
dtk6widget,
|
||||
qt6Packages,
|
||||
gtest,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -1,13 +1,14 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, pkg-config
|
||||
, mtdev
|
||||
, cairo
|
||||
, xorg
|
||||
, qt6Packages
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
pkg-config,
|
||||
mtdev,
|
||||
cairo,
|
||||
xorg,
|
||||
qt6Packages,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -1,10 +1,11 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, qmake
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
, udisks
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
qmake,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
udisks,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -18,7 +19,11 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-WS4fmqEYXi5dkn8RvyJBzy3+r+UgFcGDFFpQlbblLu4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ];
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [ udisks ];
|
||||
|
||||
|
@ -1,14 +1,15 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, qtbase
|
||||
, libmediainfo
|
||||
, libsecret
|
||||
, libisoburn
|
||||
, libuuid
|
||||
, udisks
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
qtbase,
|
||||
libmediainfo,
|
||||
libsecret,
|
||||
libisoburn,
|
||||
libuuid,
|
||||
udisks,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -1,7 +1,8 @@
|
||||
{ stdenvNoCC
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, nixos-icons
|
||||
{
|
||||
stdenvNoCC,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
nixos-icons,
|
||||
}:
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "deepin-desktop-base";
|
||||
@ -39,7 +40,10 @@ stdenvNoCC.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "Base assets and definitions for Deepin Desktop Environment";
|
||||
homepage = "https://github.com/linuxdeepin/deepin-desktop-base";
|
||||
license = with licenses; [ gpl3Plus cc-by-40 ];
|
||||
license = with licenses; [
|
||||
gpl3Plus
|
||||
cc-by-40
|
||||
];
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.deepin.members;
|
||||
};
|
||||
|
@ -1,10 +1,11 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
, dtkwidget
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
wrapQtAppsHook,
|
||||
dtkwidget,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -24,9 +25,7 @@ stdenv.mkDerivation rec {
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
dtkwidget
|
||||
];
|
||||
buildInputs = [ dtkwidget ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/{booster-dtkwidget/CMakeLists.txt,booster-desktop/{CMakeLists.txt,desktop.conf},booster-generic/CMakeLists.txt} --replace "/usr" "$out"
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user