mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-30 02:42:59 +00:00
Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
e0990771a6
3
.github/CODEOWNERS
vendored
3
.github/CODEOWNERS
vendored
@ -284,11 +284,8 @@
|
||||
# Matrix
|
||||
/pkgs/servers/heisenbridge @piegamesde
|
||||
/pkgs/servers/matrix-conduit @piegamesde
|
||||
/pkgs/servers/matrix-synapse/matrix-appservice-irc @piegamesde
|
||||
/nixos/modules/services/misc/heisenbridge.nix @piegamesde
|
||||
/nixos/modules/services/misc/matrix-appservice-irc.nix @piegamesde
|
||||
/nixos/modules/services/misc/matrix-conduit.nix @piegamesde
|
||||
/nixos/tests/matrix-appservice-irc.nix @piegamesde
|
||||
/nixos/tests/matrix-conduit.nix @piegamesde
|
||||
|
||||
# Dotnet
|
||||
|
||||
@ -331,6 +331,20 @@ rustPlatform.buildRustPackage {
|
||||
}
|
||||
```
|
||||
|
||||
#### Using `cargo-nextest` {#using-cargo-nextest}
|
||||
|
||||
Tests can be run with [cargo-nextest](https://github.com/nextest-rs/nextest)
|
||||
by setting `useNextest = true`. The same options still apply, but nextest
|
||||
accepts a different set of arguments and the settings might need to be
|
||||
adapted to be compatible with cargo-nextest.
|
||||
|
||||
```nix
|
||||
rustPlatform.buildRustPackage {
|
||||
/* ... */
|
||||
useNextest = true;
|
||||
}
|
||||
```
|
||||
|
||||
#### Setting `test-threads` {#setting-test-threads}
|
||||
|
||||
`buildRustPackage` will use parallel test threads by default,
|
||||
@ -474,6 +488,9 @@ you of the correct hash.
|
||||
flags can be passed to the tests using `checkFlags` and
|
||||
`checkFlagsArray`. By default, tests are run in parallel. This can
|
||||
be disabled by setting `dontUseCargoParallelTests`.
|
||||
* `cargoNextestHook`: run tests using
|
||||
[cargo-nextest](https://github.com/nextest-rs/nextest). The same
|
||||
options for `cargoCheckHook` also applies to `cargoNextestHook`.
|
||||
* `cargoInstallHook`: install binaries and static/shared libraries
|
||||
that were built using `cargoBuildHook`.
|
||||
* `bindgenHook`: for crates which use `bindgen` as a build dependency, lets
|
||||
|
||||
@ -3646,6 +3646,15 @@
|
||||
githubId = 126339;
|
||||
name = "Domen Kozar";
|
||||
};
|
||||
DomesticMoth = {
|
||||
name = "Andrew";
|
||||
email = "silkmoth@protonmail.com";
|
||||
github = "DomesticMoth";
|
||||
githubId = 91414737;
|
||||
keys = [{
|
||||
fingerprint = "7D6B AE0A A98A FDE9 3396 E721 F87E 15B8 3AA7 3087";
|
||||
}];
|
||||
};
|
||||
dominikh = {
|
||||
email = "dominik@honnef.co";
|
||||
github = "dominikh";
|
||||
@ -6557,6 +6566,12 @@
|
||||
githubId = 6445082;
|
||||
name = "Joseph Lukasik";
|
||||
};
|
||||
jhh = {
|
||||
email = "jeff@j3ff.io";
|
||||
github = "jhh";
|
||||
githubId = 14412;
|
||||
name = "Jeff Hutchison";
|
||||
};
|
||||
jhhuh = {
|
||||
email = "jhhuh.note@gmail.com";
|
||||
github = "jhhuh";
|
||||
@ -11970,6 +11985,12 @@
|
||||
githubId = 852967;
|
||||
name = "Russell O'Connor";
|
||||
};
|
||||
rodrgz = {
|
||||
email = "rodrgz@proton.me";
|
||||
github = "rodrgz";
|
||||
githubId = 53882428;
|
||||
name = "Erik Rodriguez";
|
||||
};
|
||||
roelvandijk = {
|
||||
email = "roel@lambdacube.nl";
|
||||
github = "roelvandijk";
|
||||
@ -14358,6 +14379,7 @@
|
||||
};
|
||||
urandom = {
|
||||
email = "colin@urandom.co.uk";
|
||||
matrix = "@urandom0:matrix.org";
|
||||
github = "urandom2";
|
||||
githubId = 2526260;
|
||||
keys = [{
|
||||
@ -16011,4 +16033,10 @@
|
||||
github = "wuyoli";
|
||||
githubId = 104238274;
|
||||
};
|
||||
ziguana = {
|
||||
name = "Zig Uana";
|
||||
email = "git@ziguana.dev";
|
||||
github = "ziguana";
|
||||
githubId = 45833444;
|
||||
};
|
||||
}
|
||||
|
||||
@ -25,7 +25,9 @@
|
||||
<itemizedlist spacing="compact">
|
||||
<listitem>
|
||||
<para>
|
||||
Create the first release note entry in this section!
|
||||
<link xlink:href="https://github.com/junegunn/fzf">fzf</link>,
|
||||
a command line fuzzyfinder. Available as
|
||||
<link linkend="opt-programs.fzf.fuzzyCompletion">programs.fzf</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
@ -88,6 +90,15 @@
|
||||
relying on this should provide their own implementation.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
Qt 5.12 and 5.14 have been removed, as the corresponding
|
||||
branches have been EOL upstream for a long time. This affected
|
||||
under 10 packages in nixpkgs, largely unmaintained upstream as
|
||||
well, however, out-of-tree package expressions may need to be
|
||||
updated manually.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>nix.readOnlyStore</literal> option has been
|
||||
@ -128,6 +139,13 @@
|
||||
the Nix store.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>unifi-poller</literal> package and corresponding
|
||||
NixOS module have been renamed to <literal>unpoller</literal>
|
||||
to match upstream.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
@ -14,7 +14,7 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
- Create the first release note entry in this section!
|
||||
- [fzf](https://github.com/junegunn/fzf), a command line fuzzyfinder. Available as [programs.fzf](#opt-programs.fzf.fuzzyCompletion).
|
||||
|
||||
## Backward Incompatibilities {#sec-release-23.05-incompatibilities}
|
||||
|
||||
@ -31,6 +31,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
- The EC2 image module previously detected and activated swap-formatted instance store devices and partitions in stage-1 (initramfs). This behaviour has been removed. Users relying on this should provide their own implementation.
|
||||
|
||||
- Qt 5.12 and 5.14 have been removed, as the corresponding branches have been EOL upstream for a long time. This affected under 10 packages in nixpkgs, largely unmaintained upstream as well, however, out-of-tree package expressions may need to be updated manually.
|
||||
|
||||
- The `nix.readOnlyStore` option has been renamed to `boot.readOnlyNixStore` to clarify that it configures the NixOS boot process, not the Nix daemon.
|
||||
|
||||
## Other Notable Changes {#sec-release-23.05-notable-changes}
|
||||
@ -42,3 +44,5 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
- A new `virtualisation.rosetta` module was added to allow running `x86_64` binaries through [Rosetta](https://developer.apple.com/documentation/apple-silicon/about-the-rosetta-translation-environment) inside virtualised NixOS guests on Apple silicon. This feature works by default with the [UTM](https://docs.getutm.app/) virtualisation [package](https://search.nixos.org/packages?channel=unstable&show=utm&from=0&size=1&sort=relevance&type=packages&query=utm).
|
||||
|
||||
- Resilio sync secret keys can now be provided using a secrets file at runtime, preventing these secrets from ending up in the Nix store.
|
||||
|
||||
- The `unifi-poller` package and corresponding NixOS module have been renamed to `unpoller` to match upstream.
|
||||
|
||||
@ -165,6 +165,7 @@
|
||||
./programs/flexoptix-app.nix
|
||||
./programs/freetds.nix
|
||||
./programs/fuse.nix
|
||||
./programs/fzf.nix
|
||||
./programs/gamemode.nix
|
||||
./programs/geary.nix
|
||||
./programs/git.nix
|
||||
@ -723,7 +724,7 @@
|
||||
./services/monitoring/thanos.nix
|
||||
./services/monitoring/tremor-rs.nix
|
||||
./services/monitoring/tuptime.nix
|
||||
./services/monitoring/unifi-poller.nix
|
||||
./services/monitoring/unpoller.nix
|
||||
./services/monitoring/ups.nix
|
||||
./services/monitoring/uptime.nix
|
||||
./services/monitoring/vmagent.nix
|
||||
|
||||
@ -20,7 +20,13 @@
|
||||
pkgs.mkpasswd # for generating password files
|
||||
|
||||
# Some text editors.
|
||||
pkgs.vim
|
||||
(pkgs.vim.customize {
|
||||
name = "vim";
|
||||
vimrcConfig.packages.default = {
|
||||
start = [ pkgs.vimPlugins.vim-nix ];
|
||||
};
|
||||
vimrcConfig.customRC = "syntax on";
|
||||
})
|
||||
|
||||
# Some networking tools.
|
||||
pkgs.fuse
|
||||
|
||||
37
nixos/modules/programs/fzf.nix
Normal file
37
nixos/modules/programs/fzf.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{pkgs, config, lib, ...}:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.programs.fzf;
|
||||
in {
|
||||
options = {
|
||||
programs.fzf = {
|
||||
fuzzyCompletion = mkOption {
|
||||
type = types.bool;
|
||||
description = lib.mdDoc "Whether to use fzf for fuzzy completion";
|
||||
default = false;
|
||||
example = true;
|
||||
};
|
||||
keybindings = mkOption {
|
||||
type = types.bool;
|
||||
description = lib.mdDoc "Whether to set up fzf keybindings";
|
||||
default = false;
|
||||
example = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
config = {
|
||||
environment.systemPackages = optional (cfg.keybindings || cfg.fuzzyCompletion) pkgs.fzf;
|
||||
programs.bash.interactiveShellInit = optionalString cfg.fuzzyCompletion ''
|
||||
source ${pkgs.fzf}/share/fzf/completion.bash
|
||||
'' + optionalString cfg.keybindings ''
|
||||
source ${pkgs.fzf}/share/fzf/key-bindings.bash
|
||||
'';
|
||||
|
||||
programs.zsh.interactiveShellInit = optionalString cfg.fuzzyCompletion ''
|
||||
source ${pkgs.fzf}/share/fzf/completion.zsh
|
||||
'' + optionalString cfg.keybindings ''
|
||||
source ${pkgs.fzf}/share/fzf/key-bindings.zsh
|
||||
'';
|
||||
};
|
||||
meta.maintainers = with maintainers; [ laalsaas ];
|
||||
}
|
||||
@ -119,9 +119,8 @@ in
|
||||
];
|
||||
SystemCallArchitectures = "native";
|
||||
SystemCallFilter = [
|
||||
"@system-service"
|
||||
"~@privileged"
|
||||
"~@resources"
|
||||
"@system-service @pkey"
|
||||
"~@privileged @resources"
|
||||
];
|
||||
UMask = "0077";
|
||||
};
|
||||
|
||||
@ -51,6 +51,7 @@ let
|
||||
"nginx"
|
||||
"nginxlog"
|
||||
"node"
|
||||
"nut"
|
||||
"openldap"
|
||||
"openvpn"
|
||||
"pihole"
|
||||
@ -72,7 +73,7 @@ let
|
||||
"tor"
|
||||
"unbound"
|
||||
"unifi"
|
||||
"unifi-poller"
|
||||
"unpoller"
|
||||
"v2ray"
|
||||
"varnish"
|
||||
"wireguard"
|
||||
@ -229,6 +230,10 @@ in
|
||||
options.services.prometheus.exporters = mkOption {
|
||||
type = types.submodule {
|
||||
options = (mkSubModules);
|
||||
imports = [
|
||||
../../../misc/assertions.nix
|
||||
(lib.mkRenamedOptionModule [ "unifi-poller" ] [ "unpoller" ])
|
||||
];
|
||||
};
|
||||
description = lib.mdDoc "Prometheus exporter configuration";
|
||||
default = {};
|
||||
@ -292,13 +297,14 @@ in
|
||||
Please specify either 'services.prometheus.exporters.sql.configuration' or
|
||||
'services.prometheus.exporters.sql.configFile'
|
||||
'';
|
||||
} ] ++ (flip map (attrNames cfg) (exporter: {
|
||||
} ] ++ (flip map (attrNames exporterOpts) (exporter: {
|
||||
assertion = cfg.${exporter}.firewallFilter != null -> cfg.${exporter}.openFirewall;
|
||||
message = ''
|
||||
The `firewallFilter'-option of exporter ${exporter} doesn't have any effect unless
|
||||
`openFirewall' is set to `true'!
|
||||
'';
|
||||
}));
|
||||
})) ++ config.services.prometheus.exporters.assertions;
|
||||
warnings = config.services.prometheus.exporters.warnings;
|
||||
}] ++ [(mkIf config.services.minio.enable {
|
||||
services.prometheus.exporters.minio.minioAddress = mkDefault "http://localhost:9000";
|
||||
services.prometheus.exporters.minio.minioAccessKey = mkDefault config.services.minio.accessKey;
|
||||
|
||||
@ -0,0 +1,50 @@
|
||||
{ config, lib, pkgs, options }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.prometheus.exporters.nut;
|
||||
in
|
||||
{
|
||||
port = 9199;
|
||||
extraOpts = {
|
||||
nutServer = mkOption {
|
||||
type = types.str;
|
||||
default = "127.0.0.1";
|
||||
description = lib.mdDoc ''
|
||||
Hostname or address of the NUT server
|
||||
'';
|
||||
};
|
||||
nutUser = mkOption {
|
||||
type = types.str;
|
||||
default = "";
|
||||
example = "nut";
|
||||
description = lib.mdDoc ''
|
||||
The user to log in into NUT server. If set, passwordPath should
|
||||
also be set.
|
||||
|
||||
Default NUT configs usually permit reading variables without
|
||||
authentication.
|
||||
'';
|
||||
};
|
||||
passwordPath = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
apply = final: if final == null then null else toString final;
|
||||
description = lib.mdDoc ''
|
||||
A run-time path to the nutUser password file, which should be
|
||||
provisioned outside of Nix store.
|
||||
'';
|
||||
};
|
||||
};
|
||||
serviceOpts = {
|
||||
script = ''
|
||||
${optionalString (cfg.passwordPath != null)
|
||||
"export NUT_EXPORTER_PASSWORD=$(cat ${toString cfg.passwordPath})"}
|
||||
${pkgs.prometheus-nut-exporter}/bin/nut_exporter \
|
||||
--nut.server=${cfg.nutServer} \
|
||||
--web.listen-address="${cfg.listenAddress}:${toString cfg.port}" \
|
||||
${optionalString (cfg.nutUser != "") "--nut.username=${cfg.nutUser}"}
|
||||
'';
|
||||
};
|
||||
}
|
||||
@ -3,9 +3,9 @@
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.prometheus.exporters.unifi-poller;
|
||||
cfg = config.services.prometheus.exporters.unpoller;
|
||||
|
||||
configFile = pkgs.writeText "prometheus-unifi-poller-exporter.json" (generators.toJSON {} {
|
||||
configFile = pkgs.writeText "prometheus-unpoller-exporter.json" (generators.toJSON {} {
|
||||
poller = { inherit (cfg.log) debug quiet; };
|
||||
unifi = { inherit (cfg) controllers; };
|
||||
influxdb.disable = true;
|
||||
@ -21,8 +21,8 @@ in {
|
||||
port = 9130;
|
||||
|
||||
extraOpts = {
|
||||
inherit (options.services.unifi-poller.unifi) controllers;
|
||||
inherit (options.services.unifi-poller) loki;
|
||||
inherit (options.services.unpoller.unifi) controllers;
|
||||
inherit (options.services.unpoller) loki;
|
||||
log = {
|
||||
debug = mkEnableOption (lib.mdDoc "debug logging including line numbers, high resolution timestamps, per-device logs.");
|
||||
quiet = mkEnableOption (lib.mdDoc "startup and error logs only.");
|
||||
@ -31,7 +31,7 @@ in {
|
||||
};
|
||||
|
||||
serviceOpts.serviceConfig = {
|
||||
ExecStart = "${pkgs.unifi-poller}/bin/unpoller --config ${configFile}";
|
||||
ExecStart = "${pkgs.unpoller}/bin/unpoller --config ${configFile}";
|
||||
DynamicUser = false;
|
||||
};
|
||||
}
|
||||
@ -3,15 +3,19 @@
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.unifi-poller;
|
||||
cfg = config.services.unpoller;
|
||||
|
||||
configFile = pkgs.writeText "unifi-poller.json" (generators.toJSON {} {
|
||||
configFile = pkgs.writeText "unpoller.json" (generators.toJSON {} {
|
||||
inherit (cfg) poller influxdb loki prometheus unifi;
|
||||
});
|
||||
|
||||
in {
|
||||
options.services.unifi-poller = {
|
||||
enable = mkEnableOption (lib.mdDoc "unifi-poller");
|
||||
imports = [
|
||||
(lib.mkRenamedOptionModule [ "services" "unifi-poller" ] [ "services" "unpoller" ])
|
||||
];
|
||||
|
||||
options.services.unpoller = {
|
||||
enable = mkEnableOption (lib.mdDoc "unpoller");
|
||||
|
||||
poller = {
|
||||
debug = mkOption {
|
||||
@ -86,8 +90,8 @@ in {
|
||||
};
|
||||
pass = mkOption {
|
||||
type = types.path;
|
||||
default = pkgs.writeText "unifi-poller-influxdb-default.password" "unifipoller";
|
||||
defaultText = literalExpression "unifi-poller-influxdb-default.password";
|
||||
default = pkgs.writeText "unpoller-influxdb-default.password" "unifipoller";
|
||||
defaultText = literalExpression "unpoller-influxdb-default.password";
|
||||
description = lib.mdDoc ''
|
||||
Path of a file containing the password for influxdb.
|
||||
This file needs to be readable by the unifi-poller user.
|
||||
@ -135,8 +139,8 @@ in {
|
||||
};
|
||||
pass = mkOption {
|
||||
type = types.path;
|
||||
default = pkgs.writeText "unifi-poller-loki-default.password" "";
|
||||
defaultText = "unifi-poller-influxdb-default.password";
|
||||
default = pkgs.writeText "unpoller-loki-default.password" "";
|
||||
defaultText = "unpoller-influxdb-default.password";
|
||||
description = lib.mdDoc ''
|
||||
Path of a file containing the password for Loki.
|
||||
This file needs to be readable by the unifi-poller user.
|
||||
@ -184,8 +188,8 @@ in {
|
||||
};
|
||||
pass = mkOption {
|
||||
type = types.path;
|
||||
default = pkgs.writeText "unifi-poller-unifi-default.password" "unifi";
|
||||
defaultText = literalExpression "unifi-poller-unifi-default.password";
|
||||
default = pkgs.writeText "unpoller-unifi-default.password" "unifi";
|
||||
defaultText = literalExpression "unpoller-unifi-default.password";
|
||||
description = lib.mdDoc ''
|
||||
Path of a file containing the password for the unifi service user.
|
||||
This file needs to be readable by the unifi-poller user.
|
||||
@ -303,7 +307,7 @@ in {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" ];
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.unifi-poller}/bin/unifi-poller --config ${configFile}";
|
||||
ExecStart = "${pkgs.unpoller}/bin/unpoller --config ${configFile}";
|
||||
Restart = "always";
|
||||
PrivateTmp = true;
|
||||
ProtectHome = true;
|
||||
@ -4,6 +4,9 @@ let
|
||||
in
|
||||
import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
name = "alps";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ hmenke ];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
server = {
|
||||
|
||||
@ -1244,15 +1244,15 @@ let
|
||||
'';
|
||||
};
|
||||
|
||||
unifi-poller = {
|
||||
nodeName = "unifi_poller";
|
||||
unpoller = {
|
||||
nodeName = "unpoller";
|
||||
exporterConfig.enable = true;
|
||||
exporterConfig.controllers = [{ }];
|
||||
exporterTest = ''
|
||||
wait_for_unit("prometheus-unifi-poller-exporter.service")
|
||||
wait_for_unit("prometheus-unpoller-exporter.service")
|
||||
wait_for_open_port(9130)
|
||||
succeed(
|
||||
"curl -sSf localhost:9130/metrics | grep 'unifipoller_build_info{.\\+} 1'"
|
||||
"curl -sSf localhost:9130/metrics | grep 'unpoller_build_info{.\\+} 1'"
|
||||
)
|
||||
'';
|
||||
};
|
||||
|
||||
@ -1,68 +1,45 @@
|
||||
{ lib, stdenv, fetchFromGitLab, fetchpatch }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, autoconf
|
||||
, automake
|
||||
, libtool
|
||||
, faad2
|
||||
, mp4v2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aacgain";
|
||||
version = "1.9.0";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "mulx";
|
||||
repo = "aacgain";
|
||||
rev = "7c29dccd878ade1301710959aeebe87a8f0828f5";
|
||||
sha256 = "07hl432vsscqg01b6wr99qmsj4gbx0i02x4k565432y6zpfmaxm0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dgilman";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-9Y23Zh7q3oB4ha17Fpm1Hu2+wtQOA1llj6WDUAO2ARU=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
# -Wnarrowing is enabled by default in recent GCC versions,
|
||||
# causing compilation to fail.
|
||||
NIX_CFLAGS_COMPILE = "-Wno-narrowing";
|
||||
|
||||
postPatch = ''
|
||||
(
|
||||
cd mp4v2
|
||||
patch -p0 < ${fetchpatch {
|
||||
name = "fix_missing_ptr_deref.patch";
|
||||
url = "https://aur.archlinux.org/cgit/aur.git/plain/fix_missing_ptr_deref.patch?h=aacgain-cvs&id=e1a19c920f57063e64bab75cb0d8624731f6e3d7";
|
||||
sha256 = "1cq7r005nvmwdjb25z80grcam7jv6k57jnl2bh349mg3ajmslbq9";
|
||||
}}
|
||||
)
|
||||
cp -R ${faad2.src}/* 3rdparty/faad2
|
||||
cp -R ${mp4v2.src}/* 3rdparty/mp4v2
|
||||
chmod -R +w 3rdparty
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
cd mp4v2
|
||||
./configure
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
autoconf
|
||||
automake
|
||||
libtool
|
||||
];
|
||||
|
||||
cd ../faad2
|
||||
./configure
|
||||
|
||||
cd ..
|
||||
./configure
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
cd mp4v2
|
||||
make libmp4v2.la
|
||||
|
||||
cd ../faad2
|
||||
make LDFLAGS=-static
|
||||
|
||||
cd ..
|
||||
make
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
install -D aacgain/aacgain "$out/bin/aacgain"
|
||||
'';
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=narrowing";
|
||||
|
||||
meta = with lib; {
|
||||
description = "ReplayGain for AAC files";
|
||||
homepage = "https://aacgain.altosdesign.com";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
homepage = "https://github.com/dgilman/aacgain";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.robbinch ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
, lib
|
||||
, pango
|
||||
, pkg-config
|
||||
, wrapGAppsHook4
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
@ -25,6 +26,7 @@ buildGoModule rec {
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
pkg-config
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@ -42,6 +44,6 @@ buildGoModule rec {
|
||||
description = "GTK4 Discord client in Go, attempt #4.";
|
||||
homepage = "https://github.com/diamondburned/gtkcord4";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ urandom ];
|
||||
maintainers = with maintainers; [ hmenke urandom ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
, makeWrapper
|
||||
, pkg-config
|
||||
, rtmidi
|
||||
, speex
|
||||
, speexdsp
|
||||
, stdenv
|
||||
, wrapGAppsHook
|
||||
, zstd
|
||||
@ -45,8 +45,8 @@ let
|
||||
fuzzysearchdatabase-source = fetchFromBitbucket {
|
||||
owner = "j_norberg";
|
||||
repo = "fuzzysearchdatabase";
|
||||
rev = "fe62479811e503ef3c091f5a859d27bfcf0a44da";
|
||||
sha256 = "zgeUzuuInHPeveBIjlivRGIz+NSb7cW/9hMndxm6qOA=";
|
||||
rev = "a3a1bf557b8e6ee58b55fa82ff77ff7a3d141949";
|
||||
sha256 = "13ib72acbxn1cnf66im0v4nlr1464v7j08ra2bprznjmy127xckm";
|
||||
};
|
||||
nanovg-source = fetchFromGitHub {
|
||||
owner = "VCVRack";
|
||||
@ -72,11 +72,23 @@ let
|
||||
rev = "2fc6405883f8451944ed080547d073c8f9f31898";
|
||||
sha256 = "/QZFZuI5kSsEvSfMJlcqB1HiZ9Vcf3vqLqWIMEgxQK8=";
|
||||
};
|
||||
simde-source = fetchFromGitHub {
|
||||
owner = "simd-everywhere";
|
||||
repo = "simde";
|
||||
rev = "dd0b662fd8cf4b1617dbbb4d08aa053e512b08e4";
|
||||
sha256 = "1kxwzdlh21scak7wsbb60vwfvndppidj5fgbi26mmh73zsj02mnv";
|
||||
};
|
||||
tinyexpr-source = fetchFromGitHub {
|
||||
owner = "codeplea";
|
||||
repo = "tinyexpr";
|
||||
rev = "4e8cc0067a1e2378faae23eb2dfdd21e9e9907c2";
|
||||
sha256 = "1yxkxsw3bc81cjm2knvyr1z9rlzwmjvq5zd125n34xwq568v904d";
|
||||
};
|
||||
fundamental-source = fetchFromGitHub {
|
||||
owner = "VCVRack";
|
||||
repo = "Fundamental";
|
||||
rev = "03bd00b96ad19e0575939bb7a0b8b08eff22f076"; # tip of branch v2
|
||||
sha256 = "1rd5yvdr6k03mc3r2y7wxhmiqd69jfvqmpqagxb83y1mn0zfv0pr";
|
||||
rev = "f80e1a0e78dc043a0ff0b777ef98a36b91063622"; # tip of branch v2
|
||||
sha256 = "0hnwrr1xhf7dpkw1v63f633x5dlrvijgbah4aj5h5xr2jchip9nx";
|
||||
};
|
||||
vcv-rtaudio = stdenv.mkDerivation rec {
|
||||
pname = "vcv-rtaudio";
|
||||
@ -103,7 +115,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "VCV-Rack";
|
||||
version = "2.1.2";
|
||||
version = "2.2.0";
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
@ -123,7 +135,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "VCVRack";
|
||||
repo = "Rack";
|
||||
rev = "v${version}";
|
||||
sha256 = "0583izk3j36mg7wm30ss2387j9dqsbbxkxrdh3993azb4q5naf02";
|
||||
sha256 = "1ag1syjxdzxx13pdcfga9ksc6a5hw9bcdfhbry8qd2pxs9lmv2q6";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -141,6 +153,8 @@ stdenv.mkDerivation rec {
|
||||
cp -r ${nanosvg-source}/* dep/nanosvg
|
||||
cp -r ${osdialog-source}/* dep/osdialog
|
||||
cp -r ${oui-blendish-source}/* dep/oui-blendish
|
||||
cp -r ${simde-source}/* dep/simde
|
||||
cp -r ${tinyexpr-source}/* dep/tinyexpr
|
||||
|
||||
cp dep/pffft/*.h dep/include
|
||||
cp dep/fuzzysearchdatabase/src/*.hpp dep/include
|
||||
@ -148,6 +162,8 @@ stdenv.mkDerivation rec {
|
||||
cp dep/nanovg/src/*.h dep/include
|
||||
cp dep/osdialog/*.h dep/include
|
||||
cp dep/oui-blendish/*.h dep/include
|
||||
cp -r dep/simde/simde dep/include
|
||||
cp dep/tinyexpr/tinyexpr.h dep/include
|
||||
|
||||
# Build and dist the Fundamental plugins
|
||||
cp -r ${fundamental-source} plugins/Fundamental/
|
||||
@ -182,12 +198,19 @@ stdenv.mkDerivation rec {
|
||||
libpulseaudio
|
||||
libsamplerate
|
||||
rtmidi
|
||||
speex
|
||||
speexdsp
|
||||
vcv-rtaudio
|
||||
zstd
|
||||
];
|
||||
|
||||
makeFlags = [ "all" "plugins" ];
|
||||
makeFlags = [
|
||||
( if stdenv.hostPlatform.system == "aarch64-linux"
|
||||
then "MACHINE=arm64-linux"
|
||||
else "MACHINE=${stdenv.hostPlatform.config}"
|
||||
)
|
||||
"all"
|
||||
"plugins"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
diff -ru a/Makefile b/Makefile
|
||||
--- a/Makefile 1970-01-01 01:00:01.000000000 +0100
|
||||
+++ b/Makefile 1970-01-01 01:00:01.000000000 +0100
|
||||
@@ -36,7 +36,7 @@ build/dep/osdialog/osdialog_gtk3.c.o: FLAGS += $(shell pkg-config --cflags gtk+-
|
||||
diff --git a/Makefile b/Makefile
|
||||
index e1be07d1..309b3b0b 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -34,7 +34,7 @@ ifdef ARCH_LIN
|
||||
|
||||
LDFLAGS += -Wl,--whole-archive
|
||||
LDFLAGS += -static-libstdc++ -static-libgcc
|
||||
@ -9,4 +10,4 @@ diff -ru a/Makefile b/Makefile
|
||||
+ LDFLAGS += -lGLEW -lglfw -ljansson -lcurl -lssl -lcrypto -larchive -lz -lspeexdsp -lsamplerate -lrtmidi -lrtaudio
|
||||
LDFLAGS += -Wl,--no-whole-archive
|
||||
LDFLAGS += -lpthread -lGL -ldl -lX11 -lasound -ljack -lpulse -lpulse-simple
|
||||
LDFLAGS += $(shell pkg-config --libs gtk+-3.0)
|
||||
endif
|
||||
|
||||
@ -301,6 +301,23 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
astro-build.astro-vscode = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "astro-vscode";
|
||||
publisher = "astro-build";
|
||||
version = "0.29.1";
|
||||
sha256 = "sha256-fMeEeYCZuORhZRds0A8HjHPncK0+SQbV0+f/zU5AIg4=";
|
||||
};
|
||||
meta = with lib; {
|
||||
changelog = "https://marketplace.visualstudio.com/items/astro-build.astro-vscode/changelog";
|
||||
description = "Astro language support for VSCode";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=astro-build.astro-vscode";
|
||||
homepage = "https://github.com/withastro/language-tools";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ wackbyte ];
|
||||
};
|
||||
};
|
||||
|
||||
asvetliakov.vscode-neovim = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-neovim";
|
||||
@ -1451,8 +1468,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "latex-workshop";
|
||||
publisher = "James-Yu";
|
||||
version = "9.0.0";
|
||||
sha256 = "sha256-aXDYRLbDZGul2mG+jZs6o5Z5QVhEiOCaLhHpj/zVt6E=";
|
||||
version = "9.1.0";
|
||||
sha256 = "sha256-a/v8/5ztB9DXqYpGWMYSRIwZIj1D+iebG35fO0yDjQQ=";
|
||||
};
|
||||
meta = with lib; {
|
||||
changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog";
|
||||
@ -2546,8 +2563,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "svelte-vscode";
|
||||
publisher = "svelte";
|
||||
version = "105.21.0";
|
||||
sha256 = "12p6msv8wi773piqm1y5zik3ky652bdaw9s83ffwnlndsh87s9n5";
|
||||
version = "106.3.0";
|
||||
sha256 = "sha256-xe1Ad24r2Ks85WAfaD5em8KGwaQ5h6i5qkUouU6lmtc=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://github.com/sveltejs/language-tools/releases";
|
||||
|
||||
@ -1,4 +1,16 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python2, gettext, openmp, Cocoa }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, autoconf
|
||||
, automake
|
||||
, gettext
|
||||
, libtool
|
||||
, python3
|
||||
, wxGTK
|
||||
, openmp
|
||||
, Cocoa
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wxHexEditor";
|
||||
@ -11,10 +23,22 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "08xnhaif8syv1fa0k6lc3jm7yg2k50b02lyds8w0jyzh4xi5crqj";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoconf automake ];
|
||||
buildInputs = [ wxGTK libtool python2 gettext ]
|
||||
++ lib.optionals stdenv.cc.isClang [ openmp ]
|
||||
++ lib.optionals stdenv.isDarwin [ Cocoa ];
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
automake
|
||||
gettext
|
||||
libtool
|
||||
python3
|
||||
wxGTK
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.cc.isClang [
|
||||
openmp
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
Cocoa
|
||||
];
|
||||
|
||||
preConfigure = "patchShebangs .";
|
||||
|
||||
@ -49,7 +73,7 @@ stdenv.mkDerivation rec {
|
||||
wxHexEditor could edit HDD/SDD disk devices or partitions in raw up to exabyte sizes.
|
||||
'';
|
||||
homepage = "http://www.wxhexeditor.org/";
|
||||
license = lib.licenses.gpl2;
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ wegank ];
|
||||
};
|
||||
|
||||
@ -17,7 +17,6 @@
|
||||
, pngSupport ? true
|
||||
# Optional dependencies
|
||||
, cairo
|
||||
, librsvg
|
||||
, libpng
|
||||
}:
|
||||
|
||||
@ -51,22 +50,21 @@ stdenv.mkDerivation rec {
|
||||
tllist
|
||||
fcft
|
||||
] ++ lib.optional enableCairo cairo
|
||||
++ lib.optional pngSupport libpng
|
||||
++ lib.optional svgSupport librsvg;
|
||||
++ lib.optional pngSupport libpng;
|
||||
|
||||
mesonBuildType = "release";
|
||||
|
||||
mesonFlags = [
|
||||
"-Denable-cairo=${if enableCairo then "enabled" else "disabled"}"
|
||||
"-Dpng-backend=${if pngSupport then "libpng" else "none"}"
|
||||
"-Dsvg-backend=${if svgSupport then "librsvg" else "none"}"
|
||||
"-Dsvg-backend=${if svgSupport then "nanosvg" else "none"}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Wayland-native application launcher, similar to rofi’s drun mode";
|
||||
homepage = "https://codeberg.org/dnkl/fuzzel";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fionera polykernel ];
|
||||
license = with licenses; [ mit zlib ];
|
||||
maintainers = with maintainers; [ fionera polykernel rodrgz ];
|
||||
platforms = with platforms; linux;
|
||||
changelog = "https://codeberg.org/dnkl/fuzzel/releases/tag/${version}";
|
||||
};
|
||||
|
||||
@ -78,6 +78,5 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ podocarp ];
|
||||
platforms = platforms.unix;
|
||||
broken = stdenv.isDarwin && stdenv.isAarch64;
|
||||
};
|
||||
})
|
||||
|
||||
57
pkgs/applications/misc/yubioath-flutter/default.nix
Normal file
57
pkgs/applications/misc/yubioath-flutter/default.nix
Normal file
@ -0,0 +1,57 @@
|
||||
{ lib
|
||||
, flutter
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
, pcre2
|
||||
}:
|
||||
|
||||
let
|
||||
vendorHashes = {
|
||||
x86_64-linux = "sha256-BwhWA8N0S55XkljDKPNkDhsj0QSpmJJ5MwEnrPjymS8=";
|
||||
aarch64-linux = "sha256-T1aGz3+2Sls+rkUVDUo39Ky2igg+dxGSUaf3qpV7ovQ=";
|
||||
};
|
||||
|
||||
version = "6.0.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Yubico";
|
||||
repo = "yubioath-flutter";
|
||||
rev = version;
|
||||
sha256 = "13nh5qpq02c6azfdh4cbzhlrq0hs9is45q5z5cnxg84hrx26hd4k";
|
||||
};
|
||||
meta = with lib; {
|
||||
description = "Yubico Authenticator for Desktop";
|
||||
homepage = "https://github.com/Yubico/yubioath-flutter";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ lukegb ];
|
||||
platforms = builtins.attrNames vendorHashes;
|
||||
};
|
||||
|
||||
helper = python3.pkgs.callPackage ./helper.nix { inherit src version meta; };
|
||||
in
|
||||
flutter.mkFlutterApp rec {
|
||||
pname = "yubioath-flutter";
|
||||
inherit src version meta;
|
||||
|
||||
passthru.helper = helper;
|
||||
|
||||
vendorHash = vendorHashes."${stdenv.system}";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace linux/CMakeLists.txt \
|
||||
--replace "../build/linux/helper" "${helper}/libexec/helper"
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
# Make sure we have permission to delete things CMake has copied in to our build directory from elsewhere.
|
||||
chmod -R +w build/
|
||||
'';
|
||||
postInstall = ''
|
||||
# Swap the authenticator-helper symlink with the correct symlink.
|
||||
ln -fs "${helper}/bin/authenticator-helper" "$out/app/helper/authenticator-helper"
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
pcre2
|
||||
];
|
||||
}
|
||||
44
pkgs/applications/misc/yubioath-flutter/helper.nix
Normal file
44
pkgs/applications/misc/yubioath-flutter/helper.nix
Normal file
@ -0,0 +1,44 @@
|
||||
{ buildPythonApplication
|
||||
, poetry-core
|
||||
, yubikey-manager
|
||||
, fido2
|
||||
, mss
|
||||
, zxing_cpp
|
||||
, pillow
|
||||
, cryptography
|
||||
|
||||
, src
|
||||
, version
|
||||
, meta
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "yubioath-flutter-helper";
|
||||
inherit src version meta;
|
||||
|
||||
sourceRoot = "source/helper";
|
||||
format = "pyproject";
|
||||
|
||||
postPatch = ''
|
||||
sed -i \
|
||||
-e 's,zxing-cpp = .*,zxing-cpp = "*",g' \
|
||||
-e 's,mss = .*,mss = "*",g' \
|
||||
pyproject.toml
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -Dm 0755 authenticator-helper.py $out/bin/authenticator-helper
|
||||
install -d $out/libexec/helper
|
||||
ln -fs $out/bin/authenticator-helper $out/libexec/helper/authenticator-helper
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
poetry-core
|
||||
yubikey-manager
|
||||
fido2
|
||||
mss
|
||||
zxing_cpp
|
||||
pillow
|
||||
cryptography
|
||||
];
|
||||
}
|
||||
@ -90,11 +90,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "brave";
|
||||
version = "1.43.89";
|
||||
version = "1.46.133";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
sha256 = "sha256-eqwqn4cvVzoEmh206ybG6PWWg56ct53wYyRBOQ8wN5g=";
|
||||
sha256 = "sha256-362XVFFsVWR/H0mcn1XQh3tsemksEnqR5quOIwf2QQE=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -142,7 +142,7 @@ assert stdenv.cc.libc or null != null;
|
||||
assert pipewireSupport -> !waylandSupport || !webrtcSupport -> throw "${pname}: pipewireSupport requires both wayland and webrtc support.";
|
||||
|
||||
let
|
||||
flag = tf: x: [(if tf then "--enable-${x}" else "--disable-${x}")];
|
||||
inherit (lib) enableFeature;
|
||||
|
||||
# Target the LLVM version that rustc is built with for LTO.
|
||||
llvmPackages0 = rustc.llvmPackages;
|
||||
@ -369,28 +369,27 @@ buildStdenv.mkDerivation ({
|
||||
# elf-hack is broken when using clang+lld:
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
|
||||
++ lib.optional (ltoSupport && (buildStdenv.isAarch32 || buildStdenv.isi686 || buildStdenv.isx86_64)) "--disable-elf-hack"
|
||||
++ lib.optional (lib.versionAtLeast version "95") "--with-wasi-sysroot=${wasiSysRoot}"
|
||||
|
||||
++ flag alsaSupport "alsa"
|
||||
++ flag jackSupport "jack"
|
||||
++ flag pulseaudioSupport "pulseaudio"
|
||||
++ lib.optional (lib.versionAtLeast version "100") (flag sndioSupport "sndio")
|
||||
++ flag ffmpegSupport "ffmpeg"
|
||||
++ flag jemallocSupport "jemalloc"
|
||||
++ flag geolocationSupport "necko-wifi"
|
||||
++ flag gssSupport "negotiateauth"
|
||||
++ flag webrtcSupport "webrtc"
|
||||
++ flag crashreporterSupport "crashreporter"
|
||||
++ lib.optional (!drmSupport) "--disable-eme"
|
||||
|
||||
++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ]
|
||||
else [ "--disable-debug" "--enable-optimize" ])
|
||||
# --enable-release adds -ffunction-sections & LTO that require a big amount of
|
||||
# RAM and the 32-bit memory space cannot handle that linking
|
||||
++ flag (!debugBuild && !stdenv.is32bit) "release"
|
||||
++ flag enableDebugSymbols "debug-symbols"
|
||||
++ lib.optional (lib.versionAtLeast version "95") "--with-wasi-sysroot=${wasiSysRoot}"
|
||||
++ lib.optional (lib.versionAtLeast version "100") (enableFeature sndioSupport "sndio")
|
||||
++ [
|
||||
(enableFeature alsaSupport "alsa")
|
||||
(enableFeature crashreporterSupport "crashreporter")
|
||||
(enableFeature ffmpegSupport "ffmpeg")
|
||||
(enableFeature geolocationSupport "necko-wifi")
|
||||
(enableFeature gssSupport "negotiateauth")
|
||||
(enableFeature jackSupport "jack")
|
||||
(enableFeature jemallocSupport "jemalloc")
|
||||
(enableFeature pulseaudioSupport "pulseaudio")
|
||||
(enableFeature webrtcSupport "webrtc")
|
||||
(enableFeature debugBuild "debug")
|
||||
(if debugBuild then "--enable-profiling" else "--enable-optimize")
|
||||
# --enable-release adds -ffunction-sections & LTO that require a big amount
|
||||
# of RAM, and the 32-bit memory space cannot handle that linking
|
||||
(enableFeature (!debugBuild && !stdenv.is32bit) "release")
|
||||
(enableFeature enableDebugSymbols "debug-symbols")
|
||||
]
|
||||
++ lib.optionals enableDebugSymbols [ "--disable-strip" "--disable-install-strip" ]
|
||||
|
||||
++ lib.optional enableOfficialBranding "--enable-official-branding"
|
||||
++ extraConfigureFlags;
|
||||
|
||||
|
||||
@ -45,7 +45,7 @@ assert with lib.strings; (
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "palemoon";
|
||||
version = "31.4.0";
|
||||
version = "31.4.1.1";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "repo.palemoon.org";
|
||||
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
|
||||
repo = "Pale-Moon";
|
||||
rev = "${version}_Release";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-x+o1Bb0HwtWsIhz1gI/s5a4qCdOrni7KsF0ZZAlJBzg=";
|
||||
sha256 = "sha256-lr8xT9tRxVjg1DxUZuCyWuCFBPPdmkvsnmAsoX8o/6Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "atlantis";
|
||||
version = "0.20.1";
|
||||
version = "0.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "runatlantis";
|
||||
repo = "atlantis";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5zchElzEjrIgODRUvQTQwlBz5371iJU5VOpz12Xtbcg=";
|
||||
sha256 = "sha256-wDyRXdlkZEzdqVSGYSzLroqMWZDTpPzsu94Mx7lvh2I=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-n2yzqNjmPDP+8/ipiuUt6BqFYF0Oh0Y0TCdKsqCcrIQ=";
|
||||
vendorSha256 = "sha256-I3fKo4lsNGQTTi8a6de85rVGoTEvr8wwE2y4OQHks7o=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
buildGoModule rec {
|
||||
pname = "bosh-cli";
|
||||
|
||||
version = "7.0.1";
|
||||
version = "7.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudfoundry";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CNicDFmWq2tgw3LEw8nOlwewY3cpzwS9ea4fxbwVJc0=";
|
||||
sha256 = "sha256-wsCVeCAgZ2RPT6cle1YHB5CZdcPmKOVuUQlA5d3H7iI=";
|
||||
};
|
||||
vendorSha256 = null;
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cilium-cli";
|
||||
version = "0.12.10";
|
||||
version = "0.12.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cilium";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XDz98mMIRmzKTEsmhxMjcSoTfKwqTX4ekjrOnTzAGyk=";
|
||||
sha256 = "sha256-50D3iH5KAWvX7lAPHY7cUKc4d4ww47ti2QOgdrfY1BY=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fn";
|
||||
version = "0.6.20";
|
||||
version = "0.6.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fnproject";
|
||||
repo = "cli";
|
||||
rev = version;
|
||||
sha256 = "sha256-HeyWMzxSga6T2/BRVwrmgb3utjnVTJk3zhhcVfq8/Cc=";
|
||||
hash = "sha256-FXgDCZcHcKvgkV1YFjMKl+5oJ5H1DV/Gj9am5VJuIjw=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "temporal-cli";
|
||||
version = "1.17.1";
|
||||
version = "1.17.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "temporalio";
|
||||
repo = "tctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rdDtgSM2wZsHYv9tBNdcSHYXdvvEk5wqdLr1KjoPz1E=";
|
||||
hash = "sha256-QID0VtARbJiTIQm2JeaejQ5VpJsAIHfZtws7i2UN8dM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-9bgovXVj+qddfDSI4DTaNYH4H8Uc4DZqeVYG5TWXTNw=";
|
||||
vendorHash = "sha256-9bgovXVj+qddfDSI4DTaNYH4H8Uc4DZqeVYG5TWXTNw=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
||||
@ -112,13 +112,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"aws": {
|
||||
"hash": "sha256-e+D9xI3lZfMDze1YW+Wjni29cPfsSlghmCkLFP/4ork=",
|
||||
"hash": "sha256-g38aJ8JN/0PZ0ArSti1/5nzflIlkz/qhn5Qz4yXCie8=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/aws",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-aws",
|
||||
"rev": "v4.44.0",
|
||||
"rev": "v4.45.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-mDn16Cww7PD5tPKRKf4uoOK3UJH9se8LCziTX10XcXY="
|
||||
"vendorHash": "sha256-C3wr/3huORBacbe0+Z0qqH+iSaJCxQwLq9wqLSirDiM="
|
||||
},
|
||||
"azuread": {
|
||||
"hash": "sha256-itaFeOEnoTIJfACvJZCIe9RWNVgewdVFZzXUK7yGglQ=",
|
||||
@ -130,11 +130,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"azurerm": {
|
||||
"hash": "sha256-aUTapTSpNZo2Tg3e/BMBGedEVwX0Sa+T2UrbgyiLOhk=",
|
||||
"hash": "sha256-2RjraGiMtITdBJ47crqlqFR51WbKpk4U6fkGHCTNXuo=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-azurerm",
|
||||
"rev": "v3.33.0",
|
||||
"rev": "v3.34.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@ -149,11 +149,11 @@
|
||||
},
|
||||
"baiducloud": {
|
||||
"deleteVendor": true,
|
||||
"hash": "sha256-0L/T12jeSkdZDJknVu5JffyaniZ1RVWgMpPu3qKNmWU=",
|
||||
"hash": "sha256-Yw0dtfPiXLSLDvlAL3OUfZsd8ihc/OCBedsSSUcedOU=",
|
||||
"homepage": "https://registry.terraform.io/providers/baidubce/baiducloud",
|
||||
"owner": "baidubce",
|
||||
"repo": "terraform-provider-baiducloud",
|
||||
"rev": "v1.18.2",
|
||||
"rev": "v1.18.3",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-ya2FpsLQMIu8zWYObpyPgBHVkHoNKzHgdMxukbtsje4="
|
||||
},
|
||||
@ -231,11 +231,11 @@
|
||||
"vendorHash": "sha256-2H+xp/A3J/xUf02voYyWP+J5MSsFM7Kz7KlgjaF99ao="
|
||||
},
|
||||
"cloudfoundry": {
|
||||
"hash": "sha256-OOORVbjcXhH6gVjLdOu8kTqy6dzIARruF4H8byMNkko=",
|
||||
"hash": "sha256-RYUs35sSL9CuwrOfUQ/S1G6W8ILgpJqVn8Xk9s2s35Y=",
|
||||
"homepage": "https://registry.terraform.io/providers/cloudfoundry-community/cloudfoundry",
|
||||
"owner": "cloudfoundry-community",
|
||||
"repo": "terraform-provider-cloudfoundry",
|
||||
"rev": "v0.50.1",
|
||||
"rev": "v0.50.2",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-mEWhLh4E3SI7xfmal1sJ5PdAYbYJrW/YFoBjTW9w4bA="
|
||||
},
|
||||
@ -625,11 +625,11 @@
|
||||
"vendorHash": "sha256-nDvnLEOtXkUJFY22pKogOzkWrj4qjyQbdlJ5pa/xnK8="
|
||||
},
|
||||
"ksyun": {
|
||||
"hash": "sha256-Rye7gKARdbrB6KDEygEJy9m7VqlGw6QeE2F1oa3n8as=",
|
||||
"hash": "sha256-PfUTE8j2tb4piNeRx4FRy8s45w8euQU773oJHbcdlVE=",
|
||||
"homepage": "https://registry.terraform.io/providers/kingsoftcloud/ksyun",
|
||||
"owner": "kingsoftcloud",
|
||||
"repo": "terraform-provider-ksyun",
|
||||
"rev": "v1.3.58",
|
||||
"rev": "v1.3.59",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-miHKAz+ONXtuC1DNukcyZbbaYReY69dz9Zk6cJdORdQ="
|
||||
},
|
||||
@ -707,11 +707,11 @@
|
||||
"vendorHash": "sha256-omaslX89hMAdIppBfILsGO6133Q3UgihgiJcy/Gn83M="
|
||||
},
|
||||
"mailgun": {
|
||||
"hash": "sha256-EQDpDuLX3uKVom/UuNbWX72N6pTPSvK+qh6nyHTcMiI=",
|
||||
"hash": "sha256-r1E2Y5JRu77T29ebUNTXUEypnrsfYYbBhvpKZGt5T9w=",
|
||||
"homepage": "https://registry.terraform.io/providers/wgebis/mailgun",
|
||||
"owner": "wgebis",
|
||||
"repo": "terraform-provider-mailgun",
|
||||
"rev": "v0.7.3",
|
||||
"rev": "v0.7.4",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-yUXxq8NTOv8ZmWp0WiIID2cRU6AZiItIs99uGZpt9dc="
|
||||
},
|
||||
@ -1086,20 +1086,20 @@
|
||||
"vendorHash": "sha256-W+dV6rmyOqCeQboYvpxYoNZixv2+uBd2+sc9BvTE+Ag="
|
||||
},
|
||||
"tailscale": {
|
||||
"hash": "sha256-/qC8TOtoVoBTWeAFpt2TYE8tlYBCCcn/mzVQ/DN51YQ=",
|
||||
"hash": "sha256-X3YV640d3pLyKm/v88oEhXfYnox+ksrEWKgiJbYl6gk=",
|
||||
"homepage": "https://registry.terraform.io/providers/tailscale/tailscale",
|
||||
"owner": "tailscale",
|
||||
"repo": "terraform-provider-tailscale",
|
||||
"rev": "v0.13.5",
|
||||
"rev": "v0.13.6",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-8EIxqKkVO706oejlvN79K8aEZAF5H2vZRdr5vbQa0l4="
|
||||
"vendorHash": "sha256-2wPmLpjhG6QgG+BUCO0oIzHjBOWIOYuptgdtSIm9TZw="
|
||||
},
|
||||
"tencentcloud": {
|
||||
"hash": "sha256-kmcZfq9gL3kybCVl4MHXYKykrqtupf7dvizbhNVVhms=",
|
||||
"hash": "sha256-beoS4io1KffsMCvYHwpWzo6NNwdi7JyPBBi/BwGFU9Y=",
|
||||
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
|
||||
"owner": "tencentcloudstack",
|
||||
"repo": "terraform-provider-tencentcloud",
|
||||
"rev": "v1.78.16",
|
||||
"rev": "v1.79.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
, src
|
||||
, jami-meta
|
||||
, lib
|
||||
, fetchpatch
|
||||
, stdenv
|
||||
, pkg-config
|
||||
, cmake
|
||||
@ -25,13 +26,20 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "jami-client-qt";
|
||||
pname = "jami-client";
|
||||
inherit version src;
|
||||
|
||||
sourceRoot = "source/client-qt";
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-build-without-webengine.patch";
|
||||
url = "https://git.jami.net/savoirfairelinux/jami-client-qt/-/commit/9b2dbb64eaa9256f800dfa69d897545f4b0affd2.patch";
|
||||
hash = "sha256-lgDlSlXIjtdymBa7xSe1PabSK9DnSG5KnJggOLWyn+A=";
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
python gen-resources.py
|
||||
echo 'const char VERSION_STRING[] = "${version}";' > src/app/version.h
|
||||
'';
|
||||
|
||||
@ -61,8 +69,8 @@ stdenv.mkDerivation {
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DRING_BUILD_DIR=${jami-daemon}/include"
|
||||
"-DRING_XML_INTERFACES_DIR=${jami-daemon}/share/dbus-1/interfaces"
|
||||
"-DLIBJAMI_INCLUDE_DIR=${jami-daemon}/include/jami"
|
||||
"-DLIBJAMI_XML_INTERFACES_DIR=${jami-daemon}/share/dbus-1/interfaces"
|
||||
] ++ lib.optionals (!withWebengine) [
|
||||
"-DWITH_WEBENGINE=false"
|
||||
];
|
||||
@ -12,11 +12,11 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "20220825.0828.c10f01f";
|
||||
version = "20221031.1308.130cc26";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://dl.jami.net/release/tarballs/jami_${version}.tar.gz";
|
||||
hash = "sha256-axQYU7+kOFE9SnI8fR4F6NFvD9ITZ85UJhg5OVniSlg=";
|
||||
hash = "sha256-+xpSoSsG+G+w8+g0FhXx+6Phroj83ijW8xWvYO+kdqY=";
|
||||
|
||||
stripRoot = false;
|
||||
postFetch = ''
|
||||
@ -87,7 +87,7 @@ rec {
|
||||
inherit version src udev jack jami-meta ffmpeg-jami pjsip-jami opendht-jami;
|
||||
};
|
||||
|
||||
jami-client-qt = qt6Packages.callPackage ./client-qt.nix {
|
||||
jami-client = qt6Packages.callPackage ./client.nix {
|
||||
inherit version src jami-meta ffmpeg-jami;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,18 +1,36 @@
|
||||
{ mkDerivation, lib, fetchurl, autoPatchelfHook, makeWrapper, xdg-utils, dbus
|
||||
, qtbase, qtwebengine, qtx11extras, qtquickcontrols, getconf, glibc
|
||||
, libXrandr, libX11, libXext, libXdamage, libXtst, libSM, libXfixes, coreutils
|
||||
{ mkDerivation
|
||||
, lib
|
||||
, fetchurl
|
||||
, autoPatchelfHook
|
||||
, makeWrapper
|
||||
, xdg-utils
|
||||
, dbus
|
||||
, qtbase
|
||||
, qtwebengine
|
||||
, qtx11extras
|
||||
, getconf
|
||||
, glibc
|
||||
, libXrandr
|
||||
, libX11
|
||||
, libXext
|
||||
, libXdamage
|
||||
, libXtst
|
||||
, libSM
|
||||
, libXfixes
|
||||
, coreutils
|
||||
, wrapQtAppsHook
|
||||
, icu63
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "teamviewer";
|
||||
# teamviewer itself has not development files but the dev output removes propagated other dev outputs from runtime
|
||||
outputs = [ "out" "dev" ];
|
||||
version = "15.29.4";
|
||||
version = "15.35.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.tvcdn.de/download/linux/version_15x/teamviewer_${version}_amd64.deb";
|
||||
sha256 = "sha256-jkFqOtU+D62S7QmNPvz58Z8wJ79lkN11pWQrtNdD+Uk=";
|
||||
sha256 = "sha256-KNUhe0c6Th2pW7+Lmo62FYdOv+8t7Z5/eQkYPN8eusc=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
@ -21,8 +39,7 @@ mkDerivation rec {
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook makeWrapper wrapQtAppsHook ];
|
||||
buildInputs = [ dbus getconf qtbase qtwebengine qtx11extras libX11 ];
|
||||
propagatedBuildInputs = [ qtquickcontrols ];
|
||||
buildInputs = [ qtbase qtwebengine qtx11extras icu63 ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/teamviewer $out/bin $out/share/applications
|
||||
@ -30,10 +47,28 @@ mkDerivation rec {
|
||||
rm -R \
|
||||
$out/share/teamviewer/logfiles \
|
||||
$out/share/teamviewer/config \
|
||||
$out/share/teamviewer/tv_bin/RTlib \
|
||||
$out/share/teamviewer/tv_bin/xdg-utils \
|
||||
$out/share/teamviewer/tv_bin/script/{teamviewer_setup,teamviewerd.sysv,teamviewerd.service,teamviewerd.*.conf,tv-delayed-start.sh}
|
||||
|
||||
# Teamviewer packages its own qt library files.
|
||||
# Most of them can be replaced by nixpkgs libraries, but the following need to be used beginning at version 15.35.7
|
||||
# because teamviewer will not start without them, either stalling at startup or even segfaulting. In the logfiles, some missing qt libraries
|
||||
# can be observed, although they are present from nixpkgs. AutoPatchelfHook will automatically choose the included libraries, if present.
|
||||
# See https://github.com/NixOS/nixpkgs/pull/202024
|
||||
|
||||
# delete all library files except "qt" folder
|
||||
find $out/share/teamviewer/tv_bin/RTlib -depth -maxdepth 1 ! -type d -execdir rm -rf {} +
|
||||
|
||||
# remove all other folders except "qml" and "plugins" from the qml directory
|
||||
find $out/share/teamviewer/tv_bin/RTlib/qt -depth -maxdepth 1 -mindepth 1 -type d ! \( -name "qml" -o -name "plugins" \) -execdir rm -rf {} +
|
||||
|
||||
# keep "QtQuick" and "QtQuick.2" directory
|
||||
find $out/share/teamviewer/tv_bin/RTlib/qt/qml -depth -maxdepth 1 -mindepth 1 -type d ! \( -name "QtQuick" -o -name "QtQuick.2" \) -execdir rm -rf {} +
|
||||
|
||||
# delete all folders except "platforms" from the plugins directory
|
||||
# it contains libqxcb.so from qtbase which seems to be incompatible with our nixpkgs version
|
||||
find $out/share/teamviewer/tv_bin/RTlib/qt/plugins -depth -maxdepth 1 -mindepth 1 -type d ! -name "platforms" -execdir rm -rf {} +
|
||||
|
||||
ln -s $out/share/teamviewer/tv_bin/script/teamviewer $out/bin
|
||||
ln -s $out/share/teamviewer/tv_bin/teamviewerd $out/bin
|
||||
ln -s $out/share/teamviewer/tv_bin/desktop/com.teamviewer.*.desktop $out/share/applications
|
||||
@ -79,7 +114,7 @@ mkDerivation rec {
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--prefix PATH : ${lib.makeBinPath [ getconf coreutils ]}"
|
||||
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libXrandr libX11 libXext libXdamage libXtst libSM libXfixes dbus ]}"
|
||||
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libXrandr libX11 libXext libXdamage libXtst libSM libXfixes dbus icu63 ]}"
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
@ -100,6 +135,6 @@ mkDerivation rec {
|
||||
license = licenses.unfree;
|
||||
description = "Desktop sharing application, providing remote support and online meetings";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ jagajaga jraygauthier ];
|
||||
maintainers = with maintainers; [ jagajaga jraygauthier gador ];
|
||||
};
|
||||
}
|
||||
|
||||
93
pkgs/applications/science/electronics/flopoco/default.nix
Normal file
93
pkgs/applications/science/electronics/flopoco/default.nix
Normal file
@ -0,0 +1,93 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, installShellFiles
|
||||
, bison
|
||||
, boost
|
||||
, flex
|
||||
, gmp
|
||||
, libxml2
|
||||
, mpfi
|
||||
, mpfr
|
||||
, scalp
|
||||
, sollya
|
||||
, wcpg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flopoco";
|
||||
version = "4.1.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
# flopoco-4.1.3 is not tagged on GitLab
|
||||
rev = "67598298207c9f3261c35679c8a5966480c4343c";
|
||||
sha256 = "sha256-0jRjg4/qciqBcjsi6BTbKO4VJkcoEzpC98wFkUOIGbI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-clang-error-sin-cos.patch";
|
||||
url = "https://gitlab.com/flopoco/flopoco/-/commit/de3aa60ad19333952c176c2a2e51f12653ca736b.patch";
|
||||
postFetch = ''
|
||||
substituteInPlace $out \
|
||||
--replace 'FixSinCosCORDIC.hpp' 'CordicSinCos.hpp'
|
||||
'';
|
||||
sha256 = "sha256-BlamA/MZuuqqvGYto+jPeQPop6gwva0y394Odw8pdwg=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fix-clang-error-atan2.patch";
|
||||
url = "https://gitlab.com/flopoco/flopoco/-/commit/a3ffe2436c1b59ee0809b3772b74f2d43c6edb99.patch";
|
||||
sha256 = "sha256-dSYcufLHDL0p1V1ghmy6X6xse5f6mjUqckaVqLZnTaA=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) ''
|
||||
sed -i "s/-pg//g" {,src/Apps/TaMaDi/}CMakeLists.txt
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
bison
|
||||
cmake
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
flex
|
||||
gmp
|
||||
libxml2
|
||||
mpfi
|
||||
mpfr
|
||||
scalp
|
||||
sollya
|
||||
wcpg
|
||||
];
|
||||
|
||||
postBuild = ''
|
||||
./flopoco BuildAutocomplete
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 flopoco $out/bin/flopoco
|
||||
cp bin* fp* ieee* longacc* $out/bin/
|
||||
installShellCompletion --bash flopoco_autocomplete
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "The FloPoCo arithmetic core generator";
|
||||
homepage = "https://flopoco.org/";
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ wegank ];
|
||||
};
|
||||
}
|
||||
@ -1,13 +1,15 @@
|
||||
{ lib, stdenv, fetchurl, autoreconfHook, automake, pkg-config
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, automake, pkg-config
|
||||
, cairo, ghostscript, ngspice, tcl, tk, xorg, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.10.12";
|
||||
version = "3.10.37";
|
||||
pname = "xcircuit";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://opencircuitdesign.com/xcircuit/archive/xcircuit-${version}.tgz";
|
||||
sha256 = "1h1ywc3mr7plvwnhdii2zgnnv5ih2nhyl4qbdjpi83dq0aq1s2mn";
|
||||
src = fetchFromGitHub {
|
||||
owner = "RTimothyEdwards";
|
||||
repo = "XCircuit";
|
||||
rev = "0056213308c92bec909e8469a0fa1515b72fc3d2";
|
||||
sha256 = "sha256-LXU5VEkLF1aKYz9ynI1qQjJUwt/zKFMPYj153OgJOOI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook automake pkg-config ];
|
||||
@ -26,6 +28,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "http://opencircuitdesign.com/xcircuit";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ spacefrogg thoughtpolice ];
|
||||
maintainers = with maintainers; [ john-shaffer spacefrogg thoughtpolice ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cbmc";
|
||||
version = "5.70.0";
|
||||
version = "5.71.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "diffblue";
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "sha256-fzc/WrHo+B9oscnTqN8nETcKc34aq4fUX8VLpYJUvRY=";
|
||||
sha256 = "sha256-GApVmLTa1GsZNhwVW6R0KsNJOQH/2qP1CfR7VyP+o8I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -11,11 +11,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "iterm2";
|
||||
version = "3.4.17";
|
||||
version = "3.4.18";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://iterm2.com/downloads/stable/iTerm2-${lib.replaceStrings ["."] ["_"] version}.zip";
|
||||
sha256 = "sha256-t7DWK1KqHChKR+ru0wYvdDOuJDBQBaOgyol1lMjMeTU=";
|
||||
sha256 = "sha256-jXaymp0GIM+UD51z1zsgz8OBHP1LiqKFGvrzutw8ecY=";
|
||||
};
|
||||
|
||||
dontFixup = true;
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- iTerm2/sources/iTermPreferences.m 2016-06-23 16:55:28.000000000 +0200
|
||||
+++ iTerm2/sources/iTermPreferences.m 2016-06-23 16:55:42.000000000 +0200
|
||||
@@ -189,7 +189,7 @@
|
||||
kPreferenceKeyInstantReplayMemoryMegabytes: @4,
|
||||
kPreferenceKeySavePasteAndCommandHistory: @NO,
|
||||
kPreferenceKeyAddBonjourHostsToProfiles: @NO,
|
||||
- kPreferenceKeyCheckForUpdatesAutomatically: @YES,
|
||||
+ kPreferenceKeyCheckForUpdatesAutomatically: @NO,
|
||||
kPreferenceKeyCheckForTestReleases: @NO,
|
||||
kPreferenceKeyLoadPrefsFromCustomFolder: @NO,
|
||||
kPreferenceKeyNeverRemindPrefsChangesLostForFileHaveSelection: @NO,
|
||||
@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "delta";
|
||||
version = "0.14.0";
|
||||
version = "0.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dandavison";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-hB8qpVXsAVJvtrdTnbPYcL9K4gL2nkZLo6vunjOP/7o=";
|
||||
sha256 = "sha256-rPtLvO6raBY6BfrP0erBaXD86W1JL8g4XC4VbkR4Pww=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-19ZGWM8vPbIEYaCxrAZ2HWgSqbeLu3hEb8eLL4a7fAI=";
|
||||
cargoSha256 = "sha256-raT8a8K05ZpiGuZdM1hNikGxqY6w0g8G1DohfybXD9s=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "git-gone";
|
||||
version = "0.4.2";
|
||||
version = "0.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lunaryorn";
|
||||
repo = "git-gone";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-aKBNi797aMPawxD+BLpk0sazXz2g0XTzmDpR/mk07no=";
|
||||
sha256 = "sha256-pHtFLJGZYlxvQxqG/LWoWeQDxa8i3ws0olAtuoyHXTM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-vO1ePqDIy5HEBauO3OkMCovrgtIVB9biJExw/q89ivE=";
|
||||
cargoSha256 = "sha256-BfUR/9WBgyUlKZ80qtqX6+AK7hRBCCsEG/IWjbcDU3c=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -13,16 +13,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "dmlive";
|
||||
version = "unstable-2022-08-22";
|
||||
version = "unstable-2022-11-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "THMonster";
|
||||
repo = pname;
|
||||
rev = "fd4fa1859f05350658db598a50d29f59d22b55a1";
|
||||
hash = "sha256-NVabHLxPHi7hWoztthPmVC5VRKQKglpytuUQOY1Hzrw=";
|
||||
rev = "711319043dca3c1fee44cd60841ef51605b42bce";
|
||||
hash = "sha256-weWl9voqTP/1ZBSLuMFzfWE5NskHNPJnFYy9n9IgcZk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-TziP7n9Xgi/wHaiF/NI6noMp1iR6vRuAXxvKJwQHbTw=";
|
||||
cargoHash = "sha256-9bonyOCQfO5Eq8T2GVCri+INCe4RUOK28nw4cnmmAWs=";
|
||||
|
||||
OPENSSL_NO_VENDOR = true;
|
||||
|
||||
|
||||
@ -1,12 +1,15 @@
|
||||
{ lib
|
||||
, buildPythonApplication
|
||||
, copyDesktopItems
|
||||
, fetchPypi
|
||||
, gobject-introspection
|
||||
, jellyfin-apiclient-python
|
||||
, jinja2
|
||||
, makeDesktopItem
|
||||
, mpv
|
||||
, pillow
|
||||
, pystray
|
||||
, python
|
||||
, python-mpv-jsonipc
|
||||
, pywebview
|
||||
, tkinter
|
||||
@ -23,6 +26,7 @@ buildPythonApplication rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
wrapGAppsHook
|
||||
gobject-introspection
|
||||
];
|
||||
@ -59,6 +63,15 @@ buildPythonApplication rec {
|
||||
--replace "notify_updates: bool = True" "notify_updates: bool = False"
|
||||
'';
|
||||
|
||||
# Install all the icons for the desktop item
|
||||
postInstall = ''
|
||||
for s in 16 32 48 64 128 256; do
|
||||
mkdir -p $out/share/icons/hicolor/''${s}x''${s}/apps
|
||||
ln -s $out/${python.sitePackages}/jellyfin_mpv_shim/integration/jellyfin-''${s}.png \
|
||||
$out/share/icons/hicolor/''${s}x''${s}/apps/${pname}.png
|
||||
done
|
||||
'';
|
||||
|
||||
# needed for pystray to access appindicator using GI
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
@ -69,6 +82,16 @@ buildPythonApplication rec {
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "jellyfin_mpv_shim" ];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = pname;
|
||||
exec = pname;
|
||||
icon = pname;
|
||||
desktopName = "Jellyfin MPV Shim";
|
||||
categories = [ "Video" "AudioVideo" "TV" "Player" ];
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/jellyfin/jellyfin-mpv-shim";
|
||||
description = "Allows casting of videos to MPV via the jellyfin mobile and web app";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "docker-compose";
|
||||
version = "2.13.0";
|
||||
version = "2.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
repo = "compose";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-m0lDnVu6T8P1di8DeQYAKBA6Y+4iSqmc0nE3iBHY5+M=";
|
||||
sha256 = "sha256-6dTVDAFq5CwLvTzOczyaM+ZILKjKZzR2SAaRq2hqk7M=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -16,7 +16,7 @@ buildGoModule rec {
|
||||
rm -rf e2e/
|
||||
'';
|
||||
|
||||
vendorSha256 = "sha256-xigDihg2SvvcFSrKYlo5VluqhqK9xzWVbrsBvsJsLXA=";
|
||||
vendorSha256 = "sha256-B6xqMsspWexTdYX+o2BJNlXuJFL7/rv8oexFUxOO8BI=";
|
||||
|
||||
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];
|
||||
|
||||
|
||||
@ -26,6 +26,18 @@ dotnetConfigureHook() {
|
||||
|
||||
(( "${#projectFile[@]}" == 0 )) && dotnetRestore
|
||||
|
||||
# Generate a NuGet.config file to make sure everything,
|
||||
# including things like <Sdk /> dependencies, is restored from the proper source
|
||||
cat <<EOF > "./NuGet.config"
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<packageSources>
|
||||
<clear />
|
||||
<add key="nugetSource" value="@nugetSource@/lib" />
|
||||
</packageSources>
|
||||
</configuration>
|
||||
EOF
|
||||
|
||||
for project in ${projectFile[@]} ${testProjectFile[@]-}; do
|
||||
dotnetRestore "$project"
|
||||
done
|
||||
|
||||
@ -88,7 +88,8 @@ let
|
||||
# so we can use lock, diff yaml
|
||||
cp "pubspec.yaml" "$RES"
|
||||
cp "pubspec.lock" "$RES"
|
||||
mv .dart_tool .flutter-plugins .flutter-plugins-dependencies .packages "$RES/f"
|
||||
[[ -e .packages ]] && mv .packages "$RES/f"
|
||||
mv .dart_tool .flutter-plugins .flutter-plugins-dependencies "$RES/f"
|
||||
|
||||
# replace paths with placeholders
|
||||
find "$RES" -type f -exec sed -i \
|
||||
@ -119,7 +120,7 @@ let
|
||||
find "$RES/.pub-cache" -iname "*.json" -exec sed -r 's|.*_fetchedAt.*| "_fetchedAt": "'"$DART_DATE"'",|g' -i {} +
|
||||
replace_line_matching "$RES/f/.dart_tool/package_config.json" '"generated"' '"generated": "'"$DART_DATE"'",'
|
||||
replace_line_matching "$RES/f/.flutter-plugins-dependencies" '"date_created"' '"date_created": "'"$DART_DATE"'",'
|
||||
remove_line_matching "$RES/f/.packages" "Generated by pub"
|
||||
[[ -e "$RES/f/.packages" ]] && remove_line_matching "$RES/f/.packages" "Generated by pub"
|
||||
|
||||
# nuke refs
|
||||
find "$RES" -type f -exec nuke-refs {} +
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
, cargoBuildHook
|
||||
, cargoCheckHook
|
||||
, cargoInstallHook
|
||||
, cargoNextestHook
|
||||
, cargoSetupHook
|
||||
, rustc
|
||||
, libiconv
|
||||
@ -40,6 +41,7 @@
|
||||
, checkNoDefaultFeatures ? buildNoDefaultFeatures
|
||||
, buildFeatures ? [ ]
|
||||
, checkFeatures ? buildFeatures
|
||||
, useNextest ? false
|
||||
, depsExtraArgs ? {}
|
||||
|
||||
# Toggles whether a custom sysroot is created when the target is a .json file.
|
||||
@ -117,7 +119,7 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg
|
||||
cacert
|
||||
git
|
||||
cargoBuildHook
|
||||
cargoCheckHook
|
||||
(if useNextest then cargoNextestHook else cargoCheckHook)
|
||||
cargoInstallHook
|
||||
cargoSetupHook
|
||||
rustc
|
||||
|
||||
54
pkgs/build-support/rust/hooks/cargo-nextest-hook.sh
Normal file
54
pkgs/build-support/rust/hooks/cargo-nextest-hook.sh
Normal file
@ -0,0 +1,54 @@
|
||||
declare -a checkFlags
|
||||
declare -a cargoTestFlags
|
||||
|
||||
cargoNextestHook() {
|
||||
echo "Executing cargoNextestHook"
|
||||
|
||||
runHook preCheck
|
||||
|
||||
if [[ -n "${buildAndTestSubdir-}" ]]; then
|
||||
pushd "${buildAndTestSubdir}"
|
||||
fi
|
||||
|
||||
if [[ -z ${dontUseCargoParallelTests-} ]]; then
|
||||
threads=$NIX_BUILD_CORES
|
||||
else
|
||||
threads=1
|
||||
fi
|
||||
|
||||
if [ "${cargoCheckType}" != "debug" ]; then
|
||||
cargoCheckProfileFlag="--${cargoCheckType}"
|
||||
fi
|
||||
|
||||
if [ -n "${cargoCheckNoDefaultFeatures-}" ]; then
|
||||
cargoCheckNoDefaultFeaturesFlag=--no-default-features
|
||||
fi
|
||||
|
||||
if [ -n "${cargoCheckFeatures-}" ]; then
|
||||
cargoCheckFeaturesFlag="--features=${cargoCheckFeatures// /,}"
|
||||
fi
|
||||
|
||||
argstr="${cargoCheckProfileFlag} ${cargoCheckNoDefaultFeaturesFlag} ${cargoCheckFeaturesFlag}
|
||||
--target @rustTargetPlatformSpec@ --frozen ${cargoTestFlags}"
|
||||
|
||||
(
|
||||
set -x
|
||||
cargo nextest run \
|
||||
-j ${threads} \
|
||||
${argstr} -- \
|
||||
${checkFlags} \
|
||||
${checkFlagsArray+"${checkFlagsArray[@]}"}
|
||||
)
|
||||
|
||||
if [[ -n "${buildAndTestSubdir-}" ]]; then
|
||||
popd
|
||||
fi
|
||||
|
||||
echo "Finished cargoNextestHook"
|
||||
|
||||
runHook postCheck
|
||||
}
|
||||
|
||||
if [ -z "${dontCargoCheck-}" ] && [ -z "${checkPhase-}" ]; then
|
||||
checkPhase=cargoNextestHook
|
||||
fi
|
||||
@ -1,6 +1,7 @@
|
||||
{ buildPackages
|
||||
, callPackage
|
||||
, cargo
|
||||
, cargo-nextest
|
||||
, clang
|
||||
, lib
|
||||
, makeSetupHook
|
||||
@ -55,6 +56,15 @@ in {
|
||||
};
|
||||
} ./cargo-install-hook.sh) {};
|
||||
|
||||
cargoNextestHook = callPackage ({ }:
|
||||
makeSetupHook {
|
||||
name = "cargo-nextest-hook.sh";
|
||||
deps = [ cargo cargo-nextest ];
|
||||
substitutions = {
|
||||
inherit rustTargetPlatformSpec;
|
||||
};
|
||||
} ./cargo-nextest-hook.sh) {};
|
||||
|
||||
cargoSetupHook = callPackage ({ }:
|
||||
makeSetupHook {
|
||||
name = "cargo-setup-hook.sh";
|
||||
|
||||
@ -49,7 +49,6 @@ denyFileList=(
|
||||
denyAttrList=(
|
||||
python27Packages
|
||||
python37Packages
|
||||
libsForQt512
|
||||
linuxPackages_
|
||||
rubyPackages_
|
||||
)
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pkg-config
|
||||
, meson
|
||||
@ -19,24 +18,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-screenshot";
|
||||
version = "6.0.2";
|
||||
version = "6.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "screenshot";
|
||||
rev = version;
|
||||
sha256 = "sha256-n+L08C/W5YnHZ5P3F1NGUYE2SH94sc4+kr1x+wXZ+cw=";
|
||||
sha256 = "sha256-7BrowiMUDcf0raeOEFen2V3nenymgE6Rg5a3RilMQaI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with meson 0.61
|
||||
# https://github.com/elementary/screenshot/pull/241
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/screenshot/commit/80a5d942e813dd098e1ef0f6629b81d2ccef05ae.patch";
|
||||
sha256 = "sha256-jOQuzUJvsjqytplLcW9BeIxzi9+/k2GFa4hHVZ3+wts=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
desktop-file-utils
|
||||
meson
|
||||
|
||||
@ -16,7 +16,7 @@ index 24e137a5b..c17ccea8a 100644
|
||||
$(TESTS):
|
||||
@cd $(SRCDIR) && \
|
||||
- $(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no --depwarn=error ./runtests.jl $@)
|
||||
+ $(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no --depwarn=error ./runtests.jl --skip LibGit2_jll --skip MozillaCACerts_jll --skip NetworkOptions --skip nghttp2_jll --skip Zlib_jll $@)
|
||||
+ $(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no --depwarn=error ./runtests.jl --skip LibGit2_jll --skip MozillaCACerts_jll --skip NetworkOptions --skip nghttp2_jll --skip Zlib_jll --skip MbedTLS_jll $@)
|
||||
|
||||
$(addprefix revise-, $(TESTS)): revise-% :
|
||||
@cd $(SRCDIR) && \
|
||||
|
||||
@ -74,7 +74,7 @@ let
|
||||
|
||||
bootstrapCompiler = stdenv.mkDerivation {
|
||||
pname = "nim-bootstrap";
|
||||
inherit (nim-unwrapped) version src;
|
||||
inherit (nim-unwrapped) version src preBuild;
|
||||
enableParallelBuilding = true;
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
@ -118,12 +118,14 @@ in {
|
||||
"-d:useGnuReadline"
|
||||
] ++ lib.optional (stdenv.isDarwin || stdenv.isLinux) "-d:nativeStacktrace";
|
||||
|
||||
preBuild = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) ''
|
||||
substituteInPlace makefile \
|
||||
--replace "aarch64" "arm64"
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
local HOME=$TMPDIR
|
||||
'' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) ''
|
||||
sed -i "s/aarch64/arm64/g" makefile
|
||||
'' + ''
|
||||
./bin/nim c --parallelBuild:$NIX_BUILD_CORES koch
|
||||
./koch boot $kochArgs --parallelBuild:$NIX_BUILD_CORES
|
||||
./koch toolsNoExternal $kochArgs --parallelBuild:$NIX_BUILD_CORES
|
||||
|
||||
@ -1,65 +0,0 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p dotnet-sdk_5 -p jq -p xmlstarlet -p curl
|
||||
set -euo pipefail
|
||||
|
||||
cat << EOL
|
||||
{ fetchurl }: [
|
||||
EOL
|
||||
|
||||
tmpdir="$(mktemp -d -p "$(pwd)")" # must be under source root
|
||||
trap 'rm -rf "$tmpdir"' EXIT
|
||||
|
||||
HOME="$tmpdir" dotnet msbuild -t:restore -p:Configuration=Release -p:RestorePackagesPath="$tmpdir"/.nuget/packages \
|
||||
-p:RestoreNoCache=true -p:RestoreForce=true \
|
||||
src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj >&2
|
||||
|
||||
mapfile -t repos < <(
|
||||
xmlstarlet sel -t -v 'configuration/packageSources/add/@value' -n NuGet.config "$tmpdir"/.nuget/NuGet/NuGet.Config |
|
||||
while IFS= read index
|
||||
do
|
||||
curl --compressed -fsL "$index" | \
|
||||
jq -r '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"'
|
||||
done
|
||||
)
|
||||
|
||||
cd "$tmpdir/.nuget/packages"
|
||||
for package in *
|
||||
do
|
||||
cd "$package"
|
||||
for version in *
|
||||
do
|
||||
found=false
|
||||
for repo in "${repos[@]}"
|
||||
do
|
||||
url="$repo$package/$version/$package.$version.nupkg"
|
||||
if curl -fsL "$url" -o /dev/null
|
||||
then
|
||||
found=true
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
if ! $found
|
||||
then
|
||||
echo "couldn't find $package $version" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
sha256=$(nix-prefetch-url "$url" 2>/dev/null)
|
||||
cat << EOL
|
||||
{
|
||||
pname = "$package";
|
||||
version = "$version";
|
||||
src = fetchurl {
|
||||
url = "$url";
|
||||
sha256 = "$sha256";
|
||||
};
|
||||
}
|
||||
EOL
|
||||
done
|
||||
cd ..
|
||||
done
|
||||
|
||||
cat << EOL
|
||||
]
|
||||
EOL
|
||||
@ -1,90 +1,40 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, mono
|
||||
, dotnet-sdk_5
|
||||
, makeWrapper
|
||||
, dotnetPackages
|
||||
, buildDotnetModule
|
||||
, dotnetCorePackages
|
||||
, unzip
|
||||
, writeText
|
||||
, symlinkJoin
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
deps = map (package: stdenv.mkDerivation (with package; {
|
||||
inherit pname version src;
|
||||
|
||||
buildInputs = [ unzip ];
|
||||
unpackPhase = ''
|
||||
unzip -o $src
|
||||
chmod -R u+r .
|
||||
function traverseRename () {
|
||||
for e in *
|
||||
do
|
||||
t="$(echo "$e" | sed -e "s/%20/\ /g" -e "s/%2B/+/g")"
|
||||
[ "$t" != "$e" ] && mv -vn "$e" "$t"
|
||||
if [ -d "$t" ]
|
||||
then
|
||||
cd "$t"
|
||||
traverseRename
|
||||
cd ..
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
traverseRename
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
package=$out/lib/dotnet/${pname}/${version}
|
||||
mkdir -p $package
|
||||
cp -r . $package
|
||||
echo "{}" > $package/.nupkg.metadata
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
dontFixup = true;
|
||||
}))
|
||||
(import ./deps.nix { inherit fetchurl; });
|
||||
|
||||
nuget-config = writeText "NuGet.Config" ''
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<packageSources>
|
||||
<clear />
|
||||
</packageSources>
|
||||
</configuration>
|
||||
'';
|
||||
|
||||
packages = symlinkJoin { name = "roslyn-deps"; paths = deps; };
|
||||
|
||||
packageVersion = "3.10.0";
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "roslyn";
|
||||
version = "${packageVersion}-1.21102.26";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dotnet";
|
||||
repo = "roslyn";
|
||||
rev = "v${version}";
|
||||
sha256 = "0yf4f4vpqn9lixr37lkp29m2mk51xcm3ysv2ag332xn6zm5zpm2b";
|
||||
hash = "sha256-4iXabFp0LqJ8TXOrqeD+oTAocg6ZTIfijfX3s3fMJuI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper dotnet-sdk_5 unzip ];
|
||||
dotnet-sdk = dotnetCorePackages.sdk_6_0;
|
||||
|
||||
projectFile = [ "src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj" ];
|
||||
|
||||
nugetDeps = ./extended-deps.nix;
|
||||
|
||||
dontDotnetFixup = true;
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
postPatch = ''
|
||||
sed -i 's/latestPatch/latestFeature/' global.json
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
rm NuGet.config
|
||||
install -m644 -D ${nuget-config} fake-home/.nuget/NuGet/NuGet.Config
|
||||
ln -s ${packages}/lib/dotnet fake-home/.nuget/packages
|
||||
HOME=$(pwd)/fake-home dotnet msbuild -r -v:m -t:pack \
|
||||
dotnet msbuild -v:m -t:pack \
|
||||
-p:Configuration=Release \
|
||||
-p:RepositoryUrl="${meta.homepage}" \
|
||||
-p:RepositoryCommit="v${version}" \
|
||||
@ -94,22 +44,24 @@ in stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
pkg=$out/lib/dotnet/microsoft.net.compilers.toolset/${packageVersion}
|
||||
mkdir -p $out/bin $pkg
|
||||
unzip -q artifacts/packages/Release/Shipping/Microsoft.Net.Compilers.Toolset.${packageVersion}-dev.nupkg \
|
||||
-d $pkg
|
||||
pkg="$out/lib/dotnet/microsoft.net.compilers.toolset/${version}"
|
||||
mkdir -p "$out/bin" "$pkg"
|
||||
|
||||
unzip -q artifacts/packages/Release/Shipping/Microsoft.Net.Compilers.Toolset.${version}-dev.nupkg \
|
||||
-d "$pkg"
|
||||
# nupkg has 0 permissions for a bunch of things
|
||||
chmod -R +rw $pkg
|
||||
chmod -R +rw "$pkg"
|
||||
|
||||
makeWrapper ${mono}/bin/mono $out/bin/csc \
|
||||
--add-flags "$pkg/tasks/net472/csc.exe"
|
||||
makeWrapper ${mono}/bin/mono $out/bin/vbs \
|
||||
--add-flags "$pkg/tasks/net472/vbs.exe"
|
||||
makeWrapper ${mono}/bin/mono $out/bin/vbc \
|
||||
--add-flags "$pkg/tasks/net472/vbc.exe"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = ".NET C# and Visual Basic compiler";
|
||||
homepage = "https://github.com/dotnet/roslyn";
|
||||
mainProgram = "csc";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ corngood ];
|
||||
|
||||
1305
pkgs/development/compilers/roslyn/deps.nix
generated
1305
pkgs/development/compilers/roslyn/deps.nix
generated
File diff suppressed because it is too large
Load Diff
11
pkgs/development/compilers/roslyn/extended-deps.nix
Normal file
11
pkgs/development/compilers/roslyn/extended-deps.nix
Normal file
@ -0,0 +1,11 @@
|
||||
# Some required nuget packages are not picked up by the deps generation script,
|
||||
# since they are referenced as a SDK reference, which unfortunately only gets
|
||||
# downloaded during build time. So we include them manually.
|
||||
{ fetchNuGet }: (import ./deps.nix { inherit fetchNuGet; }) ++ [
|
||||
(fetchNuGet rec {
|
||||
pname = "Microsoft.DotNet.Arcade.Sdk";
|
||||
version = "7.0.0-beta.22171.2";
|
||||
url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/${version}/microsoft.dotnet.arcade.sdk.${version}.nupkg";
|
||||
sha256 = "15y26skavivkwhnpfa984if3cnpnllbbwbdsjiyfdcalp32fhmjq";
|
||||
})
|
||||
]
|
||||
@ -14,7 +14,7 @@ rec {
|
||||
|
||||
buildRustPackage = callPackage ../../../build-support/rust/build-rust-package {
|
||||
git = buildPackages.gitMinimal;
|
||||
inherit stdenv cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook
|
||||
inherit stdenv cargoBuildHook cargoCheckHook cargoInstallHook cargoNextestHook cargoSetupHook
|
||||
fetchCargoTarball importCargoLock rustc;
|
||||
};
|
||||
|
||||
@ -31,5 +31,5 @@ rec {
|
||||
# Hooks
|
||||
inherit (callPackage ../../../build-support/rust/hooks {
|
||||
inherit stdenv cargo rustc;
|
||||
}) cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook maturinBuildHook bindgenHook;
|
||||
}) cargoBuildHook cargoCheckHook cargoInstallHook cargoNextestHook cargoSetupHook maturinBuildHook bindgenHook;
|
||||
}
|
||||
|
||||
@ -28,9 +28,6 @@
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "appstream";
|
||||
version = "0.15.5";
|
||||
# When bumping this package, please also check whether
|
||||
# fix-build-for-qt-olderthan-514.patch still applies by
|
||||
# building libsForQt512.appstream-qt.
|
||||
|
||||
outputs = [ "out" "dev" "installedTests" ];
|
||||
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
callPackage ./generic.nix (args // {
|
||||
baseVersion = "2.19";
|
||||
revision = "2";
|
||||
sha256 = "sha256-OvXxdhXGtc2Lgy0mn7bLTVTsZPnrCd2/Gt1Qk5QbTXU=";
|
||||
revision = "3";
|
||||
sha256 = "sha256-2uBH85nFpH8IfbXT2dno8RrkmF0UySjXHaGv+AGALVU=";
|
||||
postPatch = ''
|
||||
sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt
|
||||
'';
|
||||
|
||||
@ -46,6 +46,8 @@ stdenv.mkDerivation rec {
|
||||
ln -s botan-*.pc botan.pc || true
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cryptographic algorithms library";
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "entt";
|
||||
version = "3.11.0";
|
||||
version = "3.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skypjack";
|
||||
repo = "entt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-urB1oU4Riuo9+DKmMf317bqF4hTcm/zsSLn5fpZY27o=";
|
||||
sha256 = "sha256-/ZvMyhvnlu/5z4UHhPe8WMXmSA45Kjbr6bRqyVJH310=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
27
pkgs/development/libraries/level-zero/default.nix
Normal file
27
pkgs/development/libraries/level-zero/default.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ lib, stdenv, fetchFromGitHub, addOpenGLRunpath, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "level-zero";
|
||||
version = "1.8.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oneapi-src";
|
||||
repo = "level-zero";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hfbTgEbvrhWkZEi8Km7KaxJBAc9X1kA/T2DLooKa7KQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake addOpenGLRunpath ];
|
||||
|
||||
postFixup = ''
|
||||
addOpenGLRunpath $out/lib/libze_loader.so
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.oneapi.io/";
|
||||
description = "oneAPI Level Zero Specification Headers and Loader";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.ziguana ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -15,13 +15,13 @@ stdenv.mkDerivation rec {
|
||||
# versions. See
|
||||
# * https://github.com/NixOS/nixpkgs/pull/119838#issuecomment-822100428
|
||||
# * https://github.com/NixOS/nixpkgs/commit/0ee02a9d42b5fe1825b0f7cee7a9986bb4ba975d
|
||||
version = "2.28.0"; # nixpkgs-update: no auto update
|
||||
version = "2.28.1"; # nixpkgs-update: no auto update
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ARMmbed";
|
||||
repo = "mbedtls";
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "sha256-VDoIUBaK2e0E5nkwU1u3Wvxc+s6OzBSdIeHsJKJuZ2g=";
|
||||
sha256 = "sha256-brbZB3fINDeVWXf50ct4bxYkoBVyD6bBBijZyFQSnyw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja perl python3 ];
|
||||
|
||||
@ -2,29 +2,17 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mp4v2";
|
||||
version = "4.1.3";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
# 2020-06-20: THE current upstream, maintained and used in distros fork.
|
||||
owner = "TechSmith";
|
||||
repo = "mp4v2";
|
||||
rev = "Release-ThirdParty-MP4v2-${version}";
|
||||
sha256 = "053a0lgy819sbz92cfkq0vmkn2ky39bva554pj4ypky1j6vs04fv";
|
||||
sha256 = "sha256-OP+oVTH9pqYfHtYL1Kjrs1qey/J40ijLi5Gu8GJnvSY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchurl {
|
||||
# 2020-06-19: NOTE: # Fix build with C++11
|
||||
# Close when https://github.com/TechSmith/mp4v2/pull/36 merged/closed.
|
||||
url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/203f5a72bc97ffe089b424c47b07dd9eaea35713/trunk/libmp4v2-c++11.patch";
|
||||
sha256 = "0sbn0il7lmk77yrjyb4f0a3z3h8gsmdkscvz5n9hmrrrhrwf672w";
|
||||
})
|
||||
] ++ lib.optionals stdenv.cc.isClang [
|
||||
# unbreak build with Clang≥6 (C++14 by default). Based on https://reviews.freebsd.org/rP458678
|
||||
./fix-build-clang.patch
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [ "-Wno-error=narrowing" ];
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=narrowing";
|
||||
|
||||
# `faac' expects `mp4.h'.
|
||||
postInstall = "ln -s mp4v2/mp4v2.h $out/include/mp4.h";
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clhep";
|
||||
version = "2.4.6.0";
|
||||
version = "2.4.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-${version}.tgz";
|
||||
hash = "sha256-6NFt67hM7SjkDproR4nPWgra1F+SE/usPOdYPgbKp7E=";
|
||||
hash = "sha256-FwFhuOSYVV91xt55Nq/elWqT/JqhIaFtd56mAgh6Mjk=";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
||||
@ -1,250 +0,0 @@
|
||||
/*
|
||||
|
||||
# Updates
|
||||
|
||||
Before a major version update, make a copy of this directory. (We like to
|
||||
keep the old version around for a short time after major updates.) Add a
|
||||
top-level attribute to `top-level/all-packages.nix`.
|
||||
|
||||
1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`.
|
||||
2. From the top of the Nixpkgs tree, run
|
||||
`./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/$VERSION`.
|
||||
3. Check that the new packages build correctly.
|
||||
4. Commit the changes and open a pull request.
|
||||
|
||||
*/
|
||||
|
||||
{ newScope
|
||||
, lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper
|
||||
, bison, cups ? null, harfbuzz, libGL, perl, python2
|
||||
, gstreamer, gst-plugins-base, gtk3, dconf
|
||||
, darwin
|
||||
, buildPackages
|
||||
|
||||
# options
|
||||
, developerBuild ? false
|
||||
, decryptSslTraffic ? false
|
||||
, debug ? false
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
qtCompatVersion = srcs.qtbase.version;
|
||||
|
||||
mirror = "https://download.qt.io";
|
||||
srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; } // {
|
||||
# Community port of the now unmaintained upstream qtwebkit.
|
||||
qtwebkit = rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "qtwebkit";
|
||||
repo = "qtwebkit";
|
||||
rev = "qtwebkit-${version}";
|
||||
sha256 = "11lc5sk10d9cyg8jqkbgkqiap72b9rax7hy61nm90zw9749y2yfg";
|
||||
};
|
||||
version = "5.212.0-alpha4";
|
||||
};
|
||||
};
|
||||
|
||||
patches = {
|
||||
qtbase = [
|
||||
./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
|
||||
./qtbase.patch.d/0002-qtbase-mac.patch
|
||||
./qtbase.patch.d/0013-define-kiosurfacesuccess.patch
|
||||
|
||||
# Patch framework detection to support X.framework/X.tbd,
|
||||
# extending the current support for X.framework/X.
|
||||
./qtbase.patch.d/0015-qtbase-tbd-frameworks.patch
|
||||
|
||||
./qtbase.patch.d/0003-qtbase-mkspecs.patch
|
||||
./qtbase.patch.d/0004-qtbase-replace-libdir.patch
|
||||
./qtbase.patch.d/0005-qtbase-cmake.patch
|
||||
./qtbase.patch.d/0006-qtbase-gtk3.patch
|
||||
./qtbase.patch.d/0007-qtbase-xcursor.patch
|
||||
./qtbase.patch.d/0008-qtbase-xcompose.patch
|
||||
./qtbase.patch.d/0009-qtbase-tzdir.patch
|
||||
./qtbase.patch.d/0010-qtbase-qtpluginpath.patch
|
||||
./qtbase.patch.d/0011-qtbase-assert.patch
|
||||
./qtbase.patch.d/0012-fix-header_module.patch
|
||||
|
||||
# Ensure -I${includedir} is added to Cflags in pkg-config files.
|
||||
# See https://github.com/NixOS/nixpkgs/issues/52457
|
||||
./qtbase.patch.d/0014-qtbase-pkg-config.patch
|
||||
|
||||
# Make Qt applications work on macOS Big Sur even if they're
|
||||
# built with an older version of the macOS SDK (<10.14). This
|
||||
# issue is fixed in 5.12.11, but it requires macOS SDK 10.13 to
|
||||
# build. See https://bugreports.qt.io/browse/QTBUG-87014 for
|
||||
# more info.
|
||||
(fetchpatch {
|
||||
name = "big_sur_layer_backed_views.patch";
|
||||
url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=c5d904639dbd690a36306e2b455610029704d821";
|
||||
sha256 = "0crkw3j1iwdc1pbf5dhar0b4q3h5gs2q1sika8m12y02yk3ns697";
|
||||
})
|
||||
];
|
||||
qtdeclarative = [
|
||||
./qtdeclarative.patch
|
||||
# prevent headaches from stale qmlcache data
|
||||
./qtdeclarative-default-disable-qmlcache.patch
|
||||
];
|
||||
qtlocation = [ ./qtlocation-gcc-9.patch ];
|
||||
qtscript = [ ./qtscript.patch ];
|
||||
qtserialport = [ ./qtserialport.patch ];
|
||||
qtwebengine = [
|
||||
# glibc 2.34 compat
|
||||
(fetchpatch {
|
||||
url = "https://src.fedoraproject.org/rpms/qt5-qtwebengine/raw/d122c011631137b79455850c363676c655cf9e09/f/qtwebengine-everywhere-src-5.15.5-SIGSTKSZ.patch";
|
||||
sha256 = "sha256-CJxN6sTvWdPVEwSkr0zpPrjyhUIi6tYSWb8ZyO0sY2o=";
|
||||
excludes = [
|
||||
"src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc"
|
||||
];
|
||||
})
|
||||
./qtwebengine-no-build-skip.patch
|
||||
# https://gitlab.freedesktop.org/pulseaudio/pulseaudio/issues/707
|
||||
# https://bugreports.qt.io/browse/QTBUG-77037
|
||||
(fetchpatch {
|
||||
name = "fix-build-with-pulseaudio-13.0.patch";
|
||||
url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/fc77d6b3d5ec74e421b58f199efceb2593cbf951/trunk/qtbug-77037-workaround.patch";
|
||||
sha256 = "1gv733qfdn9746nbqqxzyjx4ijjqkkb7zb71nxax49nna5bri3am";
|
||||
})
|
||||
|
||||
./qtwebengine-darwin-no-platform-check.patch
|
||||
./qtwebengine-darwin-fix-failed-static-assertion.patch
|
||||
];
|
||||
qtwebkit = [
|
||||
(fetchpatch {
|
||||
name = "qtwebkit-bison-3.7-build.patch";
|
||||
url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch";
|
||||
sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "qtwebkit-glib-2.68.patch";
|
||||
url = "https://github.com/qtwebkit/qtwebkit/pull/1058/commits/5b698ba3faffd4e198a45be9fe74f53307395e4b.patch";
|
||||
sha256 = "0a3xv0h4lv8wggckgy8cg8xnpkg7n9h45312pdjdnnwy87xvzss0";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "qtwebkit-darwin-handle.patch";
|
||||
url = "https://github.com/qtwebkit/qtwebkit/commit/5c272a21e621a66862821d3ae680f27edcc64c19.patch";
|
||||
sha256 = "9hjqLyABz372QDgoq7nXXXQ/3OXBGcYN1/92ekcC3WE=";
|
||||
})
|
||||
./qtwebkit.patch
|
||||
./qtwebkit-icu68.patch
|
||||
|
||||
./qtwebkit-darwin-no-readline.patch
|
||||
./qtwebkit-darwin-no-qos-classes.patch
|
||||
];
|
||||
qttools = [ ./qttools.patch ];
|
||||
};
|
||||
|
||||
addPackages = self: with self;
|
||||
let
|
||||
qtModule =
|
||||
import ../qtModule.nix
|
||||
{
|
||||
inherit perl;
|
||||
inherit lib;
|
||||
# Use a variant of mkDerivation that does not include wrapQtApplications
|
||||
# to avoid cyclic dependencies between Qt modules.
|
||||
mkDerivation =
|
||||
import ../mkDerivation.nix
|
||||
{ inherit lib; inherit debug; wrapQtAppsHook = null; }
|
||||
stdenv.mkDerivation;
|
||||
}
|
||||
{ inherit self srcs patches; };
|
||||
|
||||
callPackage = self.newScope { inherit qtCompatVersion qtModule srcs stdenv; };
|
||||
in {
|
||||
|
||||
inherit callPackage qtCompatVersion qtModule srcs;
|
||||
|
||||
mkDerivationWith =
|
||||
import ../mkDerivation.nix
|
||||
{ inherit lib; inherit debug; inherit (self) wrapQtAppsHook; };
|
||||
|
||||
mkDerivation = mkDerivationWith stdenv.mkDerivation;
|
||||
|
||||
qtbase = callPackage ../modules/qtbase.nix {
|
||||
inherit (srcs.qtbase) src version;
|
||||
patches = patches.qtbase;
|
||||
inherit bison cups harfbuzz libGL;
|
||||
withGtk3 = !stdenv.isDarwin; inherit dconf gtk3;
|
||||
inherit debug developerBuild decryptSslTraffic;
|
||||
inherit (darwin.apple_sdk.frameworks) AGL AppKit ApplicationServices AVFoundation Carbon Cocoa CoreAudio CoreBluetooth
|
||||
CoreLocation CoreServices DiskArbitration Foundation OpenGL MetalKit IOKit;
|
||||
inherit (darwin) libobjc;
|
||||
};
|
||||
|
||||
qt3d = callPackage ../modules/qt3d.nix {};
|
||||
qtcharts = callPackage ../modules/qtcharts.nix {};
|
||||
qtconnectivity = callPackage ../modules/qtconnectivity.nix {};
|
||||
qtdeclarative = callPackage ../modules/qtdeclarative.nix {};
|
||||
qtdoc = callPackage ../modules/qtdoc.nix {};
|
||||
qtgamepad = callPackage ../modules/qtgamepad.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) GameController;
|
||||
};
|
||||
qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {};
|
||||
qtimageformats = callPackage ../modules/qtimageformats.nix {};
|
||||
qtlocation = callPackage ../modules/qtlocation.nix {};
|
||||
qtmacextras = callPackage ../modules/qtmacextras.nix {};
|
||||
qtmultimedia = callPackage ../modules/qtmultimedia.nix {
|
||||
inherit gstreamer gst-plugins-base;
|
||||
};
|
||||
qtnetworkauth = callPackage ../modules/qtnetworkauth.nix {};
|
||||
qtquick1 = null;
|
||||
qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {};
|
||||
qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {};
|
||||
qtscript = callPackage ../modules/qtscript.nix {};
|
||||
qtsensors = callPackage ../modules/qtsensors.nix {};
|
||||
qtserialbus = callPackage ../modules/qtserialbus.nix {};
|
||||
qtserialport = callPackage ../modules/qtserialport.nix {};
|
||||
qtspeech = callPackage ../modules/qtspeech.nix {};
|
||||
qtsvg = callPackage ../modules/qtsvg.nix {};
|
||||
qtscxml = callPackage ../modules/qtscxml.nix {};
|
||||
qttools = callPackage ../modules/qttools.nix {};
|
||||
qttranslations = callPackage ../modules/qttranslations.nix {};
|
||||
qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix {};
|
||||
qtwayland = callPackage ../modules/qtwayland.nix {};
|
||||
qtwebchannel = callPackage ../modules/qtwebchannel.nix {};
|
||||
qtwebengine = callPackage ../modules/qtwebengine.nix {
|
||||
python = python2;
|
||||
inherit (darwin) cctools libobjc libunwind xnu;
|
||||
inherit (darwin.apple_sdk.libs) sandbox;
|
||||
inherit (darwin.apple_sdk.frameworks) ApplicationServices AVFoundation Foundation ForceFeedback GameController AppKit
|
||||
ImageCaptureCore CoreBluetooth IOBluetooth CoreWLAN Quartz Cocoa LocalAuthentication;
|
||||
};
|
||||
qtwebglplugin = callPackage ../modules/qtwebglplugin.nix {};
|
||||
qtwebkit = callPackage ../modules/qtwebkit.nix {
|
||||
inherit (darwin) ICU;
|
||||
inherit (darwin.apple_sdk.frameworks) OpenGL;
|
||||
};
|
||||
qtwebsockets = callPackage ../modules/qtwebsockets.nix {};
|
||||
qtwebview = callPackage ../modules/qtwebview.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation WebKit;
|
||||
};
|
||||
qtx11extras = callPackage ../modules/qtx11extras.nix {};
|
||||
qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {};
|
||||
|
||||
env = callPackage ../qt-env.nix {};
|
||||
full = env "qt-full-${qtbase.version}" ([
|
||||
qt3d qtcharts qtconnectivity qtdeclarative qtdoc qtgamepad qtgraphicaleffects
|
||||
qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2
|
||||
qtscript qtsensors qtserialport qtsvg qttools qttranslations
|
||||
qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets
|
||||
qtwebview qtx11extras qtxmlpatterns
|
||||
] ++ lib.optional (!stdenv.isDarwin) qtwayland
|
||||
++ lib.optional (stdenv.isDarwin) qtmacextras);
|
||||
|
||||
qmake = makeSetupHook {
|
||||
deps = [ self.qtbase.dev ];
|
||||
substitutions = {
|
||||
inherit debug;
|
||||
fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh;
|
||||
};
|
||||
} ../hooks/qmake-hook.sh;
|
||||
|
||||
wrapQtAppsHook = makeSetupHook {
|
||||
deps = [ self.qtbase.dev buildPackages.makeWrapper ]
|
||||
++ lib.optional stdenv.isLinux self.qtwayland.dev;
|
||||
} ../hooks/wrap-qt-apps-hook.sh;
|
||||
};
|
||||
|
||||
in lib.makeScope newScope addPackages
|
||||
@ -1,2 +0,0 @@
|
||||
WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.10/submodules/ \
|
||||
-A '*.tar.xz' )
|
||||
@ -1,387 +0,0 @@
|
||||
diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf
|
||||
index b77494ec..470c38e7 100644
|
||||
--- a/mkspecs/common/mac.conf
|
||||
+++ b/mkspecs/common/mac.conf
|
||||
@@ -24,7 +24,7 @@ QMAKE_INCDIR_OPENGL = \
|
||||
|
||||
QMAKE_FIX_RPATH = install_name_tool -id
|
||||
|
||||
-QMAKE_LFLAGS_RPATH = -Wl,-rpath,
|
||||
+QMAKE_LFLAGS_RPATH =
|
||||
QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip
|
||||
|
||||
QMAKE_LFLAGS_REL_RPATH =
|
||||
diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf
|
||||
index d052808c..b80ec1e8 100644
|
||||
--- a/mkspecs/features/mac/default_post.prf
|
||||
+++ b/mkspecs/features/mac/default_post.prf
|
||||
@@ -68,208 +68,6 @@ qt {
|
||||
}
|
||||
}
|
||||
|
||||
-# Add the same default rpaths as Xcode does for new projects.
|
||||
-# This is especially important for iOS/tvOS/watchOS where no other option is possible.
|
||||
-!no_default_rpath {
|
||||
- QMAKE_RPATHDIR += @executable_path/../Frameworks
|
||||
- equals(TEMPLATE, lib):!plugin:lib_bundle: QMAKE_RPATHDIR += @loader_path/Frameworks
|
||||
-}
|
||||
-
|
||||
-# Don't pass -headerpad_max_install_names when using Bitcode.
|
||||
-# In that case the linker emits a warning stating that the flag is ignored when
|
||||
-# used with bitcode, for reasons that cannot be determined (rdar://problem/20748962).
|
||||
-# Using this flag is also unnecessary in practice on UIKit platforms since they
|
||||
-# are sandboxed, and only UIKit platforms support bitcode to begin with.
|
||||
-!bitcode: QMAKE_LFLAGS += $$QMAKE_LFLAGS_HEADERPAD
|
||||
-
|
||||
-app_extension_api_only {
|
||||
- QMAKE_CFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION
|
||||
- QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION
|
||||
- QMAKE_CXXFLAGS_PRECOMPILE += $$QMAKE_CFLAGS_APPLICATION_EXTENSION
|
||||
- QMAKE_LFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION
|
||||
-}
|
||||
-
|
||||
-macx-xcode {
|
||||
- qmake_pkginfo_typeinfo.name = QMAKE_PKGINFO_TYPEINFO
|
||||
- !isEmpty(QMAKE_PKGINFO_TYPEINFO): \
|
||||
- qmake_pkginfo_typeinfo.value = $$QMAKE_PKGINFO_TYPEINFO
|
||||
- else: \
|
||||
- qmake_pkginfo_typeinfo.value = "????"
|
||||
- QMAKE_MAC_XCODE_SETTINGS += qmake_pkginfo_typeinfo
|
||||
-
|
||||
- bundle_version = $$VERSION
|
||||
- isEmpty(bundle_version): bundle_version = 1.0.0
|
||||
-
|
||||
- l = $$split(bundle_version, '.') 0 0 # make sure there are at least three
|
||||
- VER_MAJ = $$member(l, 0, 0)
|
||||
- VER_MIN = $$member(l, 1, 1)
|
||||
- VER_PAT = $$member(l, 2, 2)
|
||||
- unset(l)
|
||||
-
|
||||
- qmake_full_version.name = QMAKE_FULL_VERSION
|
||||
- qmake_full_version.value = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
|
||||
- QMAKE_MAC_XCODE_SETTINGS += qmake_full_version
|
||||
-
|
||||
- qmake_short_version.name = QMAKE_SHORT_VERSION
|
||||
- qmake_short_version.value = $${VER_MAJ}.$${VER_MIN}
|
||||
- QMAKE_MAC_XCODE_SETTINGS += qmake_short_version
|
||||
-
|
||||
- !isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) {
|
||||
- debug_information_format.name = DEBUG_INFORMATION_FORMAT
|
||||
- debug_information_format.value = $$QMAKE_XCODE_DEBUG_INFORMATION_FORMAT
|
||||
- debug_information_format.build = debug
|
||||
- QMAKE_MAC_XCODE_SETTINGS += debug_information_format
|
||||
- }
|
||||
-
|
||||
- QMAKE_XCODE_ARCHS =
|
||||
-
|
||||
- arch_device.name = "ARCHS[sdk=$${device.sdk}*]"
|
||||
- arch_device.value = $$QMAKE_APPLE_DEVICE_ARCHS
|
||||
- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS
|
||||
- QMAKE_MAC_XCODE_SETTINGS += arch_device
|
||||
-
|
||||
- simulator {
|
||||
- arch_simulator.name = "ARCHS[sdk=$${simulator.sdk}*]"
|
||||
- arch_simulator.value = $$QMAKE_APPLE_SIMULATOR_ARCHS
|
||||
- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_SIMULATOR_ARCHS
|
||||
- QMAKE_MAC_XCODE_SETTINGS += arch_simulator
|
||||
- }
|
||||
-
|
||||
- only_active_arch.name = ONLY_ACTIVE_ARCH
|
||||
- only_active_arch.value = YES
|
||||
- only_active_arch.build = debug
|
||||
- QMAKE_MAC_XCODE_SETTINGS += only_active_arch
|
||||
-} else {
|
||||
- device|!simulator: VALID_DEVICE_ARCHS = $$QMAKE_APPLE_DEVICE_ARCHS
|
||||
- simulator: VALID_SIMULATOR_ARCHS = $$QMAKE_APPLE_SIMULATOR_ARCHS
|
||||
- VALID_ARCHS = $$VALID_DEVICE_ARCHS $$VALID_SIMULATOR_ARCHS
|
||||
-
|
||||
- isEmpty(VALID_ARCHS): \
|
||||
- error("QMAKE_APPLE_DEVICE_ARCHS or QMAKE_APPLE_SIMULATOR_ARCHS must contain at least one architecture")
|
||||
-
|
||||
- single_arch: VALID_ARCHS = $$first(VALID_ARCHS)
|
||||
-
|
||||
- ACTIVE_ARCHS = $(filter $(EXPORT_VALID_ARCHS), $(ARCHS))
|
||||
- ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ACTIVE_ARCHS), $(EXPORT_ACTIVE_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch))
|
||||
-
|
||||
- QMAKE_EXTRA_VARIABLES += VALID_ARCHS ACTIVE_ARCHS ARCH_ARGS
|
||||
-
|
||||
- arch_flags = $(EXPORT_ARCH_ARGS)
|
||||
-
|
||||
- QMAKE_CFLAGS += $$arch_flags
|
||||
- QMAKE_CXXFLAGS += $$arch_flags
|
||||
- QMAKE_LFLAGS += $$arch_flags
|
||||
-
|
||||
- QMAKE_PCH_ARCHS = $$VALID_ARCHS
|
||||
-
|
||||
- macos: deployment_target = $$QMAKE_MACOSX_DEPLOYMENT_TARGET
|
||||
- ios: deployment_target = $$QMAKE_IOS_DEPLOYMENT_TARGET
|
||||
- tvos: deployment_target = $$QMAKE_TVOS_DEPLOYMENT_TARGET
|
||||
- watchos: deployment_target = $$QMAKE_WATCHOS_DEPLOYMENT_TARGET
|
||||
-
|
||||
- # If we're doing a simulator and device build, device and simulator
|
||||
- # architectures use different paths and flags for the sysroot and
|
||||
- # deployment target switch, so we must multiplex them across multiple
|
||||
- # architectures using -Xarch. Otherwise we fall back to the simple path.
|
||||
- # This is not strictly necessary, but results in cleaner command lines
|
||||
- # and makes it easier for people to override EXPORT_VALID_ARCHS to limit
|
||||
- # individual rules to a different set of architecture(s) from the overall
|
||||
- # build (such as machtest in QtCore).
|
||||
- simulator:device {
|
||||
- QMAKE_XARCH_CFLAGS =
|
||||
- QMAKE_XARCH_LFLAGS =
|
||||
- QMAKE_EXTRA_VARIABLES += QMAKE_XARCH_CFLAGS QMAKE_XARCH_LFLAGS
|
||||
-
|
||||
- for (arch, VALID_ARCHS) {
|
||||
- contains(VALID_SIMULATOR_ARCHS, $$arch) {
|
||||
- sdk = $$simulator.sdk
|
||||
- version_identifier = $$simulator.deployment_identifier
|
||||
- } else {
|
||||
- sdk = $$device.sdk
|
||||
- version_identifier = $$device.deployment_identifier
|
||||
- }
|
||||
-
|
||||
- version_min_flags = \
|
||||
- -Xarch_$${arch} \
|
||||
- -m$${version_identifier}-version-min=$$deployment_target
|
||||
- QMAKE_XARCH_CFLAGS_$${arch} = $$version_min_flags \
|
||||
- -Xarch_$${arch} \
|
||||
- -isysroot$$xcodeSDKInfo(Path, $$sdk)
|
||||
- QMAKE_XARCH_LFLAGS_$${arch} = $$version_min_flags \
|
||||
- -Xarch_$${arch} \
|
||||
- -isysroot$$xcodeSDKInfo(Path, $$sdk)
|
||||
-
|
||||
- QMAKE_XARCH_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS_$${arch})
|
||||
- QMAKE_XARCH_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS_$${arch})
|
||||
-
|
||||
- QMAKE_EXTRA_VARIABLES += \
|
||||
- QMAKE_XARCH_CFLAGS_$${arch} \
|
||||
- QMAKE_XARCH_LFLAGS_$${arch}
|
||||
- }
|
||||
-
|
||||
- QMAKE_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS)
|
||||
- QMAKE_CXXFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS)
|
||||
- QMAKE_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS)
|
||||
- } else {
|
||||
- simulator: \
|
||||
- version_identifier = $$simulator.deployment_identifier
|
||||
- else: \
|
||||
- version_identifier = $$device.deployment_identifier
|
||||
- version_min_flag = -m$${version_identifier}-version-min=$$deployment_target
|
||||
- QMAKE_CFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag
|
||||
- QMAKE_CXXFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag
|
||||
- QMAKE_LFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag
|
||||
- }
|
||||
-
|
||||
- # Enable precompiled headers for multiple architectures
|
||||
- QMAKE_CFLAGS_USE_PRECOMPILE =
|
||||
- for (arch, VALID_ARCHS) {
|
||||
- icc_pch_style: \
|
||||
- use_flag = "-pch-use "
|
||||
- else: \
|
||||
- use_flag = -include
|
||||
-
|
||||
- # Only use Xarch with multi-arch, as the option confuses ccache
|
||||
- count(VALID_ARCHS, 1, greaterThan): \
|
||||
- QMAKE_CFLAGS_USE_PRECOMPILE += \
|
||||
- -Xarch_$${arch}
|
||||
-
|
||||
- QMAKE_CFLAGS_USE_PRECOMPILE += \
|
||||
- $${use_flag}${QMAKE_PCH_OUTPUT_$${arch}}
|
||||
- }
|
||||
- icc_pch_style {
|
||||
- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -include ${QMAKE_PCH_INPUT}
|
||||
- QMAKE_CFLAGS_USE_PRECOMPILE =
|
||||
- } else {
|
||||
- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
|
||||
- QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
|
||||
- QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
|
||||
- }
|
||||
-
|
||||
- QMAKE_PCH_OUTPUT_EXT = _${QMAKE_PCH_ARCH}$${QMAKE_PCH_OUTPUT_EXT}
|
||||
-}
|
||||
-
|
||||
-!equals(sdk_version, $$QMAKE_MAC_SDK_VERSION) {
|
||||
- # Explicit SDK version has been set, respect that
|
||||
- QMAKE_LFLAGS += -Wl,-sdk_version -Wl,$$sdk_version
|
||||
-}
|
||||
-
|
||||
-cache(QMAKE_XCODE_DEVELOPER_PATH, stash)
|
||||
-!isEmpty(QMAKE_XCODE_VERSION): \
|
||||
- cache(QMAKE_XCODE_VERSION, stash)
|
||||
-
|
||||
-QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix()
|
||||
-
|
||||
-xcode_product_bundle_identifier_setting.name = PRODUCT_BUNDLE_IDENTIFIER
|
||||
-xcode_product_bundle_identifier_setting.value = $$QMAKE_TARGET_BUNDLE_PREFIX
|
||||
-isEmpty(xcode_product_bundle_identifier_setting.value): \
|
||||
- xcode_product_bundle_identifier_setting.value = "com.yourcompany"
|
||||
-xcode_product_bundle_target = $$QMAKE_BUNDLE
|
||||
-isEmpty(xcode_product_bundle_target): \
|
||||
- xcode_product_bundle_target = ${PRODUCT_NAME:rfc1034identifier}
|
||||
-xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.$${xcode_product_bundle_target}"
|
||||
-QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting
|
||||
-
|
||||
!macx-xcode {
|
||||
generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS
|
||||
generate_xcode_project.target = xcodeproj
|
||||
diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf
|
||||
index e3534561..3b01424e 100644
|
||||
--- a/mkspecs/features/mac/default_pre.prf
|
||||
+++ b/mkspecs/features/mac/default_pre.prf
|
||||
@@ -1,60 +1,2 @@
|
||||
CONFIG = asset_catalogs rez $$CONFIG
|
||||
load(default_pre)
|
||||
-
|
||||
-isEmpty(QMAKE_XCODE_DEVELOPER_PATH) {
|
||||
- # Get path of Xcode's Developer directory
|
||||
- QMAKE_XCODE_DEVELOPER_PATH = $$system("/usr/bin/xcode-select --print-path 2>/dev/null")
|
||||
- isEmpty(QMAKE_XCODE_DEVELOPER_PATH): \
|
||||
- error("Xcode path is not set. Please use xcode-select to choose Xcode installation path.")
|
||||
-
|
||||
- # Make sure Xcode path is valid
|
||||
- !exists($$QMAKE_XCODE_DEVELOPER_PATH): \
|
||||
- error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.")
|
||||
-}
|
||||
-
|
||||
-isEmpty(QMAKE_XCODEBUILD_PATH): \
|
||||
- QMAKE_XCODEBUILD_PATH = $$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null")
|
||||
-
|
||||
-!isEmpty(QMAKE_XCODEBUILD_PATH) {
|
||||
- # Make sure Xcode is set up properly
|
||||
- !system("/usr/bin/xcrun xcodebuild -license check 2>/dev/null"): \
|
||||
- error("Xcode not set up properly. You need to confirm the license agreement by running 'sudo xcrun xcodebuild -license accept'.")
|
||||
-
|
||||
- isEmpty(QMAKE_XCODE_VERSION) {
|
||||
- # Extract Xcode version using xcodebuild
|
||||
- xcode_version = $$system("/usr/bin/xcrun xcodebuild -version")
|
||||
- QMAKE_XCODE_VERSION = $$member(xcode_version, 1)
|
||||
- isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.")
|
||||
- unset(xcode_version)
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-isEmpty(QMAKE_TARGET_BUNDLE_PREFIX) {
|
||||
- QMAKE_XCODE_PREFERENCES_FILE = $$(HOME)/Library/Preferences/com.apple.dt.Xcode.plist
|
||||
- exists($$QMAKE_XCODE_PREFERENCES_FILE): \
|
||||
- QMAKE_TARGET_BUNDLE_PREFIX = $$system("/usr/libexec/PlistBuddy -c 'print IDETemplateOptions:bundleIdentifierPrefix' $$QMAKE_XCODE_PREFERENCES_FILE 2>/dev/null")
|
||||
-
|
||||
- !isEmpty(_QMAKE_CACHE_):!isEmpty(QMAKE_TARGET_BUNDLE_PREFIX): \
|
||||
- cache(QMAKE_TARGET_BUNDLE_PREFIX)
|
||||
-}
|
||||
-
|
||||
-QMAKE_ASSET_CATALOGS_APP_ICON = AppIcon
|
||||
-
|
||||
-# Make the default debug info format for static debug builds
|
||||
-# DWARF instead of DWARF with dSYM. This cuts down build times
|
||||
-# for application debug builds significantly, as Xcode doesn't
|
||||
-# have to pull out all the DWARF info from the Qt static libs
|
||||
-# and put it into a dSYM file. We don't need that dSYM file in
|
||||
-# the first place, since the information is available in the
|
||||
-# object files inside the archives (static libraries).
|
||||
-macx-xcode:qtConfig(static): \
|
||||
- QMAKE_XCODE_DEBUG_INFORMATION_FORMAT = dwarf
|
||||
-
|
||||
-# This variable is used by the xcode_dynamic_library_suffix
|
||||
-# feature, which allows Xcode to choose the Qt libraries to link to
|
||||
-# at build time, depending on the current Xcode SDK and configuration.
|
||||
-QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX
|
||||
-
|
||||
-xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP
|
||||
-xcode_copy_phase_strip_setting.value = NO
|
||||
-QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting
|
||||
diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk
|
||||
index c40f58c9..e69de29b 100644
|
||||
--- a/mkspecs/features/mac/sdk.mk
|
||||
+++ b/mkspecs/features/mac/sdk.mk
|
||||
@@ -1,25 +0,0 @@
|
||||
-
|
||||
-ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),)
|
||||
- CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>&1
|
||||
- CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) $(CHECK_SDK_COMMAND))
|
||||
- ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION))
|
||||
- # We don't want to complain about out of date SDK unless the target needs to be remade.
|
||||
- # This covers use-cases such as running 'make check' after moving the build to a
|
||||
- # computer without Xcode or with a different Xcode version.
|
||||
- TARGET_UP_TO_DATE := $(shell QT_MAC_SDK_NO_VERSION_CHECK=1 $(MAKE) --question $(QMAKE_TARGET) && echo 1 || echo 0)
|
||||
- ifeq ($(TARGET_UP_TO_DATE),0)
|
||||
- ifneq ($(findstring missing DEVELOPER_DIR path,$(CURRENT_MAC_SDK_VERSION)),)
|
||||
- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) is no longer valid.)
|
||||
- else ifneq ($(findstring SDK "$(EXPORT_QMAKE_MAC_SDK)" cannot be located,$(CURRENT_MAC_SDK_VERSION)),)
|
||||
- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) no longer contains the $(EXPORT_QMAKE_MAC_SDK_VERSION) platform SDK.)
|
||||
- else ifneq ($(CURRENT_MAC_SDK_VERSION),)
|
||||
- $(info The platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).)
|
||||
- else
|
||||
- $(info Unknown error resolving current platform SDK version.)
|
||||
- endif
|
||||
- $(info This requires a fresh build. Please wipe the build directory completely,)
|
||||
- $(info including any .qmake.stash and .qmake.cache files generated by qmake.)
|
||||
- $(error ^)
|
||||
- endif
|
||||
- endif
|
||||
-endif
|
||||
diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf
|
||||
index 3a9c2778..e69de29b 100644
|
||||
--- a/mkspecs/features/mac/sdk.prf
|
||||
+++ b/mkspecs/features/mac/sdk.prf
|
||||
@@ -1,61 +0,0 @@
|
||||
-
|
||||
-isEmpty(QMAKE_MAC_SDK): \
|
||||
- error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.")
|
||||
-
|
||||
-contains(QMAKE_MAC_SDK, .*/.*): \
|
||||
- error("QMAKE_MAC_SDK can only contain short-form SDK names (eg. macosx, iphoneos)")
|
||||
-
|
||||
-defineReplace(xcodeSDKInfo) {
|
||||
- info = $$1
|
||||
- equals(info, "Path"): \
|
||||
- infoarg = --show-sdk-path
|
||||
- equals(info, "PlatformPath"): \
|
||||
- infoarg = --show-sdk-platform-path
|
||||
- equals(info, "SDKVersion"): \
|
||||
- infoarg = --show-sdk-version
|
||||
- sdk = $$2
|
||||
- isEmpty(sdk): \
|
||||
- sdk = $$QMAKE_MAC_SDK
|
||||
-
|
||||
- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) {
|
||||
- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$infoarg 2>/dev/null")
|
||||
- # --show-sdk-platform-path won't work for Command Line Tools; this is fine
|
||||
- # only used by the XCTest backend to testlib
|
||||
- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(infoarg, "--show-sdk-platform-path")): \
|
||||
- error("Could not resolve SDK $$info for \'$$sdk\' using $$infoarg")
|
||||
- cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info})
|
||||
- }
|
||||
-
|
||||
- return($$eval(QMAKE_MAC_SDK.$${sdk}.$${info}))
|
||||
-}
|
||||
-
|
||||
-QMAKE_MAC_SDK_PATH = $$xcodeSDKInfo(Path)
|
||||
-QMAKE_MAC_SDK_PLATFORM_PATH = $$xcodeSDKInfo(PlatformPath)
|
||||
-QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion)
|
||||
-
|
||||
-isEmpty(QMAKE_EXPORT_INCDIR_OPENGL) {
|
||||
- QMAKE_EXPORT_INCDIR_OPENGL = $$QMAKE_INCDIR_OPENGL
|
||||
- sysrootified =
|
||||
- for(val, QMAKE_INCDIR_OPENGL): sysrootified += $${QMAKE_MAC_SDK_PATH}$$val
|
||||
- QMAKE_INCDIR_OPENGL = $$sysrootified
|
||||
-}
|
||||
-
|
||||
-QMAKESPEC_NAME = $$basename(QMAKESPEC)
|
||||
-
|
||||
-# Resolve SDK version of various tools
|
||||
-for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_LINK QMAKE_LINK_SHLIB QMAKE_ACTOOL QMAKE_LINK_C QMAKE_LINK_C_SHLIB)) {
|
||||
- tool_variable = QMAKE_MAC_SDK.$${QMAKESPEC_NAME}.$${QMAKE_MAC_SDK}.$${tool}
|
||||
- !isEmpty($$tool_variable) {
|
||||
- $$tool = $$eval($$tool_variable)
|
||||
- next()
|
||||
- }
|
||||
-
|
||||
- value = $$eval($$tool)
|
||||
- isEmpty(value): next()
|
||||
-
|
||||
- sysrooted = $$system("/usr/bin/xcrun -sdk $$QMAKE_MAC_SDK -find $$first(value) 2>/dev/null")
|
||||
- isEmpty(sysrooted): next()
|
||||
-
|
||||
- $$tool = $$sysrooted $$member(value, 1, -1)
|
||||
- cache($$tool_variable, set stash, $$tool)
|
||||
-}
|
||||
@ -1,116 +0,0 @@
|
||||
From 203c9338dc92c2c36007cfe6633387348976637e Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@mailbox.org>
|
||||
Date: Tue, 17 Sep 2019 05:37:15 -0500
|
||||
Subject: [PATCH 02/12] qtbase-mac
|
||||
|
||||
---
|
||||
src/corelib/kernel/qcore_mac_p.h | 16 ++++++++++++++--
|
||||
src/testlib/qappletestlogger.cpp | 2 +-
|
||||
src/testlib/qappletestlogger_p.h | 2 +-
|
||||
src/testlib/qtestcase.cpp | 2 +-
|
||||
src/testlib/qtestlog.cpp | 2 +-
|
||||
src/testlib/qtestlog_p.h | 2 +-
|
||||
6 files changed, 19 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h
|
||||
index f96e7358..650946b7 100644
|
||||
--- a/src/corelib/kernel/qcore_mac_p.h
|
||||
+++ b/src/corelib/kernel/qcore_mac_p.h
|
||||
@@ -212,7 +212,7 @@ private:
|
||||
|
||||
// --------------------------------------------------------------------------
|
||||
|
||||
-#if !defined(QT_BOOTSTRAPPED)
|
||||
+#if 0
|
||||
|
||||
QT_END_NAMESPACE
|
||||
#include <os/activity.h>
|
||||
@@ -290,7 +290,19 @@ QT_MAC_WEAK_IMPORT(_os_activity_current);
|
||||
|
||||
#define QT_APPLE_SCOPED_LOG_ACTIVITY(...) QAppleLogActivity scopedLogActivity = QT_APPLE_LOG_ACTIVITY(__VA_ARGS__).enter();
|
||||
|
||||
-#endif // !defined(QT_BOOTSTRAPPED)
|
||||
+#else // !defined(QT_BOOTSTRAPPED)
|
||||
+
|
||||
+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT3(...)
|
||||
+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT2(...)
|
||||
+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT(...)
|
||||
+
|
||||
+#define QT_APPLE_LOG_ACTIVITY2(...)
|
||||
+#define QT_APPLE_LOG_ACTIVITY1(...)
|
||||
+#define QT_APPLE_LOG_ACTIVITY(...)
|
||||
+
|
||||
+#define QT_APPLE_SCOPED_LOG_ACTIVITY(...)
|
||||
+
|
||||
+#endif
|
||||
|
||||
// -------------------------------------------------------------------------
|
||||
|
||||
diff --git a/src/testlib/qappletestlogger.cpp b/src/testlib/qappletestlogger.cpp
|
||||
index dfeadebd..2a74330c 100644
|
||||
--- a/src/testlib/qappletestlogger.cpp
|
||||
+++ b/src/testlib/qappletestlogger.cpp
|
||||
@@ -43,7 +43,7 @@
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
-#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
|
||||
+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
|
||||
|
||||
using namespace QTestPrivate;
|
||||
|
||||
diff --git a/src/testlib/qappletestlogger_p.h b/src/testlib/qappletestlogger_p.h
|
||||
index 62c6d95c..f8e0a3b7 100644
|
||||
--- a/src/testlib/qappletestlogger_p.h
|
||||
+++ b/src/testlib/qappletestlogger_p.h
|
||||
@@ -57,7 +57,7 @@
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
-#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
|
||||
+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
|
||||
class QAppleTestLogger : public QAbstractTestLogger
|
||||
{
|
||||
public:
|
||||
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
|
||||
index 0c935a1f..22f2d75d 100644
|
||||
--- a/src/testlib/qtestcase.cpp
|
||||
+++ b/src/testlib/qtestcase.cpp
|
||||
@@ -850,7 +850,7 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, char *argv[], bool qml)
|
||||
|
||||
bool addFallbackLogger = !explicitLoggerRequested;
|
||||
|
||||
-#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
|
||||
+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
|
||||
// Any explicitly requested loggers will be added by now, so we can check if they use stdout
|
||||
const bool safeToAddAppleLogger = !AppleUnifiedLogger::willMirrorToStderr() || !QTestLog::loggerUsingStdout();
|
||||
if (safeToAddAppleLogger && QAppleTestLogger::debugLoggingEnabled()) {
|
||||
diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp
|
||||
index 57bb7d95..33fb8162 100644
|
||||
--- a/src/testlib/qtestlog.cpp
|
||||
+++ b/src/testlib/qtestlog.cpp
|
||||
@@ -460,7 +460,7 @@ void QTestLog::addLogger(LogMode mode, const char *filename)
|
||||
case QTestLog::TAP:
|
||||
logger = new QTapTestLogger(filename);
|
||||
break;
|
||||
-#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
|
||||
+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
|
||||
case QTestLog::Apple:
|
||||
logger = new QAppleTestLogger;
|
||||
break;
|
||||
diff --git a/src/testlib/qtestlog_p.h b/src/testlib/qtestlog_p.h
|
||||
index e63e89a7..213b6945 100644
|
||||
--- a/src/testlib/qtestlog_p.h
|
||||
+++ b/src/testlib/qtestlog_p.h
|
||||
@@ -68,7 +68,7 @@ class Q_TESTLIB_EXPORT QTestLog
|
||||
public:
|
||||
enum LogMode {
|
||||
Plain = 0, XML, LightXML, XunitXML, CSV, TeamCity, TAP
|
||||
-#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
|
||||
+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
|
||||
, Apple
|
||||
#endif
|
||||
#if defined(HAVE_XCTEST)
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@ -1,491 +0,0 @@
|
||||
From 9ffbcc5e362d17aea3e3d67e43cd3cd993e987eb Mon Sep 17 00:00:00 2001
|
||||
From: OPNA2608 <christoph.neidahl@gmail.com>
|
||||
Date: Mon, 12 Apr 2021 20:05:25 +0200
|
||||
Subject: [PATCH 03/12] qtbase-mkspecs
|
||||
|
||||
---
|
||||
mkspecs/features/create_cmake.prf | 53 ++++--------
|
||||
.../data/cmake/Qt5BasicConfig.cmake.in | 80 +------------------
|
||||
mkspecs/features/qml_module.prf | 2 +-
|
||||
mkspecs/features/qml_plugin.prf | 2 +-
|
||||
mkspecs/features/qt_app.prf | 2 +-
|
||||
mkspecs/features/qt_build_paths.prf | 4 +-
|
||||
mkspecs/features/qt_docs.prf | 10 +--
|
||||
mkspecs/features/qt_example_installs.prf | 2 +-
|
||||
mkspecs/features/qt_functions.prf | 27 ++++---
|
||||
mkspecs/features/qt_installs.prf | 22 ++---
|
||||
mkspecs/features/qt_plugin.prf | 2 +-
|
||||
11 files changed, 53 insertions(+), 153 deletions(-)
|
||||
|
||||
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
|
||||
index 02e5775983..3782949d32 100644
|
||||
--- a/mkspecs/features/create_cmake.prf
|
||||
+++ b/mkspecs/features/create_cmake.prf
|
||||
@@ -21,7 +21,7 @@ load(cmake_functions)
|
||||
# at cmake time whether package has been found via a symlink, and correct
|
||||
# that to an absolute path. This is only done for installations to
|
||||
# the /usr or / prefix.
|
||||
-CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPath($$[QT_INSTALL_LIBS])
|
||||
+CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPath($$NIX_OUTPUT_OUT/lib/)
|
||||
contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR
|
||||
|
||||
CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake
|
||||
@@ -70,45 +70,20 @@ split_incpath {
|
||||
$$cmake_extra_source_includes.output
|
||||
}
|
||||
|
||||
-CMAKE_INCLUDE_DIR = $$cmakeRelativePath($$[QT_INSTALL_HEADERS], $$[QT_INSTALL_PREFIX])
|
||||
-contains(CMAKE_INCLUDE_DIR, "^\\.\\./.*") {
|
||||
- CMAKE_INCLUDE_DIR = $$[QT_INSTALL_HEADERS]/
|
||||
- CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True
|
||||
-}
|
||||
+CMAKE_INCLUDE_DIR = $$NIX_OUTPUT_DEV/include/
|
||||
+CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True
|
||||
|
||||
-CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX])
|
||||
-contains(CMAKE_LIB_DIR,"^\\.\\./.*") {
|
||||
- CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/
|
||||
- CMAKE_LIB_DIR_IS_ABSOLUTE = True
|
||||
-} else {
|
||||
- CMAKE_RELATIVE_INSTALL_LIBS_DIR = $$cmakeRelativePath($$[QT_INSTALL_PREFIX], $$[QT_INSTALL_LIBS])
|
||||
- # We need to go up another two levels because the CMake files are
|
||||
- # installed in $${CMAKE_LIB_DIR}/cmake/Qt5$${CMAKE_MODULE_NAME}
|
||||
- CMAKE_RELATIVE_INSTALL_DIR = "$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}../../"
|
||||
-}
|
||||
+CMAKE_BIN_DIR = $$NIX_OUTPUT_BIN/bin/
|
||||
+CMAKE_BIN_DIR_IS_ABSOLUTE = True
|
||||
|
||||
-CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX])
|
||||
-contains(CMAKE_BIN_DIR, "^\\.\\./.*") {
|
||||
- CMAKE_BIN_DIR = $$[QT_HOST_BINS]/
|
||||
- CMAKE_BIN_DIR_IS_ABSOLUTE = True
|
||||
-}
|
||||
+CMAKE_LIB_DIR = $$NIX_OUTPUT_OUT/lib/
|
||||
+CMAKE_LIB_DIR_IS_ABSOLUTE = True
|
||||
|
||||
-CMAKE_PLUGIN_DIR = $$cmakeRelativePath($$[QT_INSTALL_PLUGINS], $$[QT_INSTALL_PREFIX])
|
||||
-contains(CMAKE_PLUGIN_DIR, "^\\.\\./.*") {
|
||||
- CMAKE_PLUGIN_DIR = $$[QT_INSTALL_PLUGINS]/
|
||||
- CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True
|
||||
-}
|
||||
-
|
||||
-win32:!static:!staticlib {
|
||||
- CMAKE_DLL_DIR = $$cmakeRelativePath($$[QT_INSTALL_BINS], $$[QT_INSTALL_PREFIX])
|
||||
- contains(CMAKE_DLL_DIR, "^\\.\\./.*") {
|
||||
- CMAKE_DLL_DIR = $$[QT_INSTALL_BINS]/
|
||||
- CMAKE_DLL_DIR_IS_ABSOLUTE = True
|
||||
- }
|
||||
-} else {
|
||||
- CMAKE_DLL_DIR = $$CMAKE_LIB_DIR
|
||||
- CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE
|
||||
-}
|
||||
+CMAKE_PLUGIN_DIR = $$NIX_OUTPUT_PLUGIN/
|
||||
+CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True
|
||||
+
|
||||
+CMAKE_DLL_DIR = $$NIX_OUTPUT_OUT/lib/
|
||||
+CMAKE_DLL_DIR_IS_ABSOLUTE = True
|
||||
|
||||
static|staticlib:CMAKE_STATIC_TYPE = true
|
||||
|
||||
@@ -188,7 +163,7 @@ contains(CONFIG, plugin) {
|
||||
cmake_target_file
|
||||
|
||||
cmake_qt5_plugin_file.files = $$cmake_target_file.output
|
||||
- cmake_qt5_plugin_file.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME}
|
||||
+ cmake_qt5_plugin_file.path = $$NIX_OUTPUT_OUT/lib/cmake/Qt5$${CMAKE_MODULE_NAME}
|
||||
INSTALLS += cmake_qt5_plugin_file
|
||||
|
||||
return()
|
||||
@@ -334,7 +309,7 @@ exists($$cmake_macros_file.input) {
|
||||
cmake_qt5_module_files.files += $$cmake_macros_file.output
|
||||
}
|
||||
|
||||
-cmake_qt5_module_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME}
|
||||
+cmake_qt5_module_files.path = $$NIX_OUTPUT_OUT/lib/cmake/Qt5$${CMAKE_MODULE_NAME}
|
||||
|
||||
# We are generating cmake files. Most developers of Qt are not aware of cmake,
|
||||
# so we require automatic tests to be available. The only module which should
|
||||
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
index c729892889..c60ef16e64 100644
|
||||
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
@@ -3,30 +3,6 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0)
|
||||
message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\")
|
||||
endif()
|
||||
|
||||
-!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND)
|
||||
-!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
|
||||
-set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
|
||||
-!!ELSE
|
||||
-get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH)
|
||||
-# Use original install prefix when loaded through a
|
||||
-# cross-prefix symbolic link such as /lib -> /usr/lib.
|
||||
-get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH)
|
||||
-get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH)
|
||||
-if(_realCurr STREQUAL _realOrig)
|
||||
- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE)
|
||||
-else()
|
||||
- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE)
|
||||
-endif()
|
||||
-unset(_realOrig)
|
||||
-unset(_realCurr)
|
||||
-unset(_IMPORT_PREFIX)
|
||||
-!!ENDIF
|
||||
-!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
|
||||
-get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE)
|
||||
-!!ELSE
|
||||
-set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
|
||||
-!!ENDIF
|
||||
-
|
||||
!!IF !equals(TEMPLATE, aux)
|
||||
# For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead.
|
||||
set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)")
|
||||
@@ -52,11 +28,7 @@ endmacro()
|
||||
macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION)
|
||||
set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
|
||||
|
||||
-!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
|
||||
- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
|
||||
-!!ELSE
|
||||
set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
|
||||
-!!ENDIF
|
||||
_qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
|
||||
set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
|
||||
\"INTERFACE_LINK_LIBRARIES\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
|
||||
@@ -69,11 +41,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
|
||||
)
|
||||
|
||||
!!IF !isEmpty(CMAKE_WINDOWS_BUILD)
|
||||
-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
|
||||
- set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
|
||||
-!!ELSE
|
||||
set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
|
||||
-!!ENDIF
|
||||
_qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib})
|
||||
if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\")
|
||||
set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
|
||||
@@ -89,24 +57,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
|
||||
!!IF !no_module_headers
|
||||
!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
|
||||
set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS
|
||||
- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework\"
|
||||
- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Headers\"
|
||||
+ \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework\"
|
||||
+ \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Headers\"
|
||||
)
|
||||
!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
|
||||
set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
|
||||
- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\"
|
||||
- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\"
|
||||
- )
|
||||
-!!ELSE
|
||||
- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
|
||||
-!!ENDIF
|
||||
-!!ELSE
|
||||
-!!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
|
||||
- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\")
|
||||
-!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
|
||||
- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
|
||||
- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\"
|
||||
- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\"
|
||||
+ \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\"
|
||||
+ \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\"
|
||||
)
|
||||
!!ELSE
|
||||
set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
|
||||
@@ -122,7 +79,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
|
||||
set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
|
||||
!!ENDIF
|
||||
!!ENDIF
|
||||
-!!ENDIF
|
||||
!!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS)
|
||||
include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL)
|
||||
!!ENDIF
|
||||
@@ -272,25 +228,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
|
||||
!!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
|
||||
!!IF isEmpty(CMAKE_DEBUG_TYPE)
|
||||
!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
|
||||
-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
|
||||
- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
|
||||
-!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE
|
||||
if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
|
||||
-!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
|
||||
_populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" )
|
||||
!!ELSE // CMAKE_STATIC_WINDOWS_BUILD
|
||||
if (EXISTS
|
||||
-!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
|
||||
- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
|
||||
-!!ELSE
|
||||
\"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
|
||||
-!!ENDIF
|
||||
AND EXISTS
|
||||
-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
|
||||
- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
|
||||
-!!ELSE
|
||||
\"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
|
||||
-!!ENDIF
|
||||
_populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
|
||||
!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
|
||||
endif()
|
||||
@@ -309,25 +253,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
|
||||
!!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
|
||||
!!IF isEmpty(CMAKE_RELEASE_TYPE)
|
||||
!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
|
||||
-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
|
||||
- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
|
||||
-!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE
|
||||
if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
|
||||
-!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
|
||||
_populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" )
|
||||
!!ELSE // CMAKE_STATIC_WINDOWS_BUILD
|
||||
if (EXISTS
|
||||
-!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
|
||||
- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
|
||||
-!!ELSE
|
||||
\"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
|
||||
-!!ENDIF
|
||||
AND EXISTS
|
||||
-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
|
||||
- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
|
||||
-!!ELSE
|
||||
\"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
|
||||
-!!ENDIF
|
||||
_populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
|
||||
!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
|
||||
endif()
|
||||
@@ -346,11 +278,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
|
||||
macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
|
||||
set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
|
||||
|
||||
-!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
|
||||
- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
|
||||
-!!ELSE
|
||||
set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
|
||||
-!!ENDIF
|
||||
_qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
|
||||
set_target_properties(Qt5::${Plugin} PROPERTIES
|
||||
\"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
|
||||
diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf
|
||||
index 57cfec78b3..5cbd7c52ef 100644
|
||||
--- a/mkspecs/features/qml_module.prf
|
||||
+++ b/mkspecs/features/qml_module.prf
|
||||
@@ -51,7 +51,7 @@ builtin_resources {
|
||||
# Install rules
|
||||
qmldir.base = $$qmldir_path
|
||||
qmldir.files = $$qmldir_file
|
||||
-qmldir.path = $$[QT_INSTALL_QML]/$$TARGETPATH
|
||||
+qmldir.path = $$NIX_OUTPUT_QML/$$TARGETPATH
|
||||
INSTALLS += qmldir
|
||||
|
||||
qmlfiles.base = $$_PRO_FILE_PWD_
|
||||
diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf
|
||||
index ad8ecdf5f1..804634b22e 100644
|
||||
--- a/mkspecs/features/qml_plugin.prf
|
||||
+++ b/mkspecs/features/qml_plugin.prf
|
||||
@@ -50,7 +50,7 @@ load(qt_build_paths)
|
||||
|
||||
DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH
|
||||
|
||||
-target.path = $$[QT_INSTALL_QML]/$$TARGETPATH
|
||||
+target.path = $$NIX_OUTPUT_QML/$$TARGETPATH
|
||||
INSTALLS += target
|
||||
|
||||
# Some final setup
|
||||
diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf
|
||||
index 8354f30eea..62028fef8e 100644
|
||||
--- a/mkspecs/features/qt_app.prf
|
||||
+++ b/mkspecs/features/qt_app.prf
|
||||
@@ -30,7 +30,7 @@ host_build:force_bootstrap {
|
||||
target.path = $$[QT_HOST_BINS]
|
||||
} else {
|
||||
!build_pass:qtConfig(debug_and_release): CONFIG += release
|
||||
- target.path = $$[QT_INSTALL_BINS]
|
||||
+ target.path = $$NIX_OUTPUT_BIN/bin
|
||||
CONFIG += relative_qt_rpath # Qt's tools and apps should be relocatable
|
||||
}
|
||||
INSTALLS += target
|
||||
diff --git a/mkspecs/features/qt_build_paths.prf b/mkspecs/features/qt_build_paths.prf
|
||||
index 3bb3823a8e..655b7b7db8 100644
|
||||
--- a/mkspecs/features/qt_build_paths.prf
|
||||
+++ b/mkspecs/features/qt_build_paths.prf
|
||||
@@ -24,6 +24,6 @@ exists($$MODULE_BASE_INDIR/.git): \
|
||||
!force_independent {
|
||||
# If the module is not built independently, everything ends up in qtbase.
|
||||
# This is the case in non-prefix builds, except for selected modules.
|
||||
- MODULE_BASE_OUTDIR = $$[QT_HOST_PREFIX]
|
||||
- MODULE_QMAKE_OUTDIR = $$[QT_HOST_PREFIX]
|
||||
+ MODULE_BASE_OUTDIR = $$NIX_OUTPUT_OUT
|
||||
+ MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT
|
||||
}
|
||||
diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf
|
||||
index 3b74cd4dd5..6bfbbe6e2d 100644
|
||||
--- a/mkspecs/features/qt_docs.prf
|
||||
+++ b/mkspecs/features/qt_docs.prf
|
||||
@@ -45,7 +45,7 @@ QMAKE_DOCS_OUTPUTDIR = $$QMAKE_DOCS_BASE_OUTDIR/$$QMAKE_DOCS_TARGETDIR
|
||||
|
||||
QDOC += -outputdir $$shell_quote($$QMAKE_DOCS_OUTPUTDIR)
|
||||
!build_online_docs: \
|
||||
- QDOC += -installdir $$shell_quote($$[QT_INSTALL_DOCS])
|
||||
+ QDOC += -installdir $$shell_quote($$NIX_OUTPUT_DOC)
|
||||
PREP_DOC_INDEXES =
|
||||
DOC_INDEXES =
|
||||
!isEmpty(QTREPOS) {
|
||||
@@ -64,8 +64,8 @@ DOC_INDEXES =
|
||||
DOC_INDEXES += -indexdir $$shell_quote($$qrep/doc)
|
||||
} else {
|
||||
prepare_docs: \
|
||||
- PREP_DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get])
|
||||
- DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get])
|
||||
+ PREP_DOC_INDEXES += -indexdir $$shell_quote($$NIX_OUTPUT_DOC)
|
||||
+ DOC_INDEXES += -indexdir $$shell_quote($$NIX_OUTPUT_DOC)
|
||||
}
|
||||
|
||||
qtattributionsscanner.target = qtattributionsscanner
|
||||
@@ -88,12 +88,12 @@ prepare_docs {
|
||||
qch_docs.commands = $$QHELPGENERATOR $$shell_quote($$QMAKE_DOCS_OUTPUTDIR/$${QMAKE_DOCS_TARGET}.qhp) -o $$shell_quote($$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch)
|
||||
|
||||
inst_html_docs.files = $$QMAKE_DOCS_OUTPUTDIR
|
||||
- inst_html_docs.path = $$[QT_INSTALL_DOCS]
|
||||
+ inst_html_docs.path = $$NIX_OUTPUT_DOC
|
||||
inst_html_docs.CONFIG += no_check_exist directory no_default_install no_build
|
||||
INSTALLS += inst_html_docs
|
||||
|
||||
inst_qch_docs.files = $$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch
|
||||
- inst_qch_docs.path = $$[QT_INSTALL_DOCS]
|
||||
+ inst_qch_docs.path = $$NIX_OUTPUT_DOC
|
||||
inst_qch_docs.CONFIG += no_check_exist no_default_install no_build
|
||||
INSTALLS += inst_qch_docs
|
||||
|
||||
diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf
|
||||
index 43b58817fe..e635b8f67a 100644
|
||||
--- a/mkspecs/features/qt_example_installs.prf
|
||||
+++ b/mkspecs/features/qt_example_installs.prf
|
||||
@@ -88,7 +88,7 @@ sourcefiles += \
|
||||
$$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \
|
||||
$$DBUS_ADAPTORS $$DBUS_INTERFACES
|
||||
addInstallFiles(sources.files, $$sourcefiles)
|
||||
-sources.path = $$[QT_INSTALL_EXAMPLES]/$$probase
|
||||
+sources.path = $$NIX_OUTPUT_DEV/share/examples/$$probase
|
||||
INSTALLS += sources
|
||||
|
||||
check_examples {
|
||||
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
|
||||
index 1903e509c8..1dc117a388 100644
|
||||
--- a/mkspecs/features/qt_functions.prf
|
||||
+++ b/mkspecs/features/qt_functions.prf
|
||||
@@ -69,19 +69,22 @@ defineTest(qtHaveModule) {
|
||||
defineTest(qtPrepareTool) {
|
||||
cmd = $$eval(QT_TOOL.$${2}.binary)
|
||||
isEmpty(cmd) {
|
||||
- cmd = $$[QT_HOST_BINS]/$$2
|
||||
- exists($${cmd}.pl) {
|
||||
- $${1}_EXE = $${cmd}.pl
|
||||
- cmd = perl -w $$system_path($${cmd}.pl)
|
||||
- } else: contains(QMAKE_HOST.os, Windows) {
|
||||
- $${1}_EXE = $${cmd}.exe
|
||||
- cmd = $$system_path($${cmd}.exe)
|
||||
- } else:contains(QMAKE_HOST.os, Darwin) {
|
||||
- BUNDLENAME = $${cmd}.app/Contents/MacOS/$$2
|
||||
- exists($$BUNDLENAME) {
|
||||
- cmd = $$BUNDLENAME
|
||||
+ cmd = $$system("command -v $${2}")
|
||||
+ isEmpty(cmd) {
|
||||
+ cmd = $$system("command -v $${2}.pl")
|
||||
+ !isEmpty(cmd) {
|
||||
+ $${1}_EXE = $$cmd
|
||||
+ cmd = perl -w $$system_path($${cmd})
|
||||
+ } else: contains(QMAKE_HOST.os, Windows) {
|
||||
+ cmd = $$system("command -v $${2}.exe")
|
||||
+ $${1}_EXE = $$cmd
|
||||
+ } else: contains(QMAKE_HOST.os, Darwin) {
|
||||
+ cmd = $$system("command -v $${2}.app")
|
||||
+ !isEmpty(cmd) {
|
||||
+ cmd = $${cmd}/Contents/MacOS/$${2}
|
||||
+ $${1}_EXE = $$cmd
|
||||
+ }
|
||||
}
|
||||
- $${1}_EXE = $$cmd
|
||||
} else {
|
||||
$${1}_EXE = $$cmd
|
||||
}
|
||||
diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf
|
||||
index 1ebca17366..b784441da0 100644
|
||||
--- a/mkspecs/features/qt_installs.prf
|
||||
+++ b/mkspecs/features/qt_installs.prf
|
||||
@@ -12,16 +12,10 @@
|
||||
#library
|
||||
!qt_no_install_library {
|
||||
win32 {
|
||||
- host_build: \
|
||||
- dlltarget.path = $$[QT_HOST_BINS]
|
||||
- else: \
|
||||
- dlltarget.path = $$[QT_INSTALL_BINS]
|
||||
+ dlltarget.path = $$NIX_OUTPUT_BIN/bin
|
||||
INSTALLS += dlltarget
|
||||
}
|
||||
- host_build: \
|
||||
- target.path = $$[QT_HOST_LIBS]
|
||||
- else: \
|
||||
- target.path = $$[QT_INSTALL_LIBS]
|
||||
+ target.path = $$NIX_OUTPUT_OUT/lib
|
||||
!static: target.CONFIG = no_dll
|
||||
INSTALLS += target
|
||||
}
|
||||
@@ -29,35 +23,35 @@
|
||||
#headers
|
||||
qt_install_headers {
|
||||
gen_headers.files = $$SYNCQT.GENERATED_HEADER_FILES
|
||||
- gen_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME
|
||||
+ gen_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME
|
||||
INSTALLS += gen_headers
|
||||
|
||||
targ_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.INJECTED_HEADER_FILES
|
||||
- targ_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME
|
||||
+ targ_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME
|
||||
INSTALLS += targ_headers
|
||||
|
||||
private_headers.files = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.INJECTED_PRIVATE_HEADER_FILES
|
||||
- private_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private
|
||||
+ private_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private
|
||||
generated_privates: \
|
||||
private_headers.CONFIG += no_check_exist
|
||||
INSTALLS += private_headers
|
||||
|
||||
qpa_headers.files = $$SYNCQT.QPA_HEADER_FILES
|
||||
- qpa_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/qpa
|
||||
+ qpa_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/qpa
|
||||
INSTALLS += qpa_headers
|
||||
}
|
||||
|
||||
#module
|
||||
qt_install_module {
|
||||
!isEmpty(MODULE_PRI) {
|
||||
- pritarget.path = $$[QT_HOST_DATA]/mkspecs/modules
|
||||
+ pritarget.path = $$NIX_OUTPUT_DEV/mkspecs/modules
|
||||
pritarget.files = $$MODULE_PRI
|
||||
INSTALLS += pritarget
|
||||
} else: isEmpty(MODULE_PRIVATE_PRI) {
|
||||
warning("Project $$basename(_PRO_FILE_) is a module, but has not defined MODULE_PRI, which is required for Qt to expose the module to other projects.")
|
||||
}
|
||||
!isEmpty(MODULE_PRIVATE_PRI) {
|
||||
- privpritarget.path = $$[QT_HOST_DATA]/mkspecs/modules
|
||||
+ privpritarget.path = $$NIX_OUTPUT_DEV/mkspecs/modules
|
||||
privpritarget.files = $$MODULE_PRIVATE_PRI
|
||||
INSTALLS += privpritarget
|
||||
}
|
||||
diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf
|
||||
index 40528a65e2..903f795284 100644
|
||||
--- a/mkspecs/features/qt_plugin.prf
|
||||
+++ b/mkspecs/features/qt_plugin.prf
|
||||
@@ -88,7 +88,7 @@ CONFIG(static, static|shared)|prefix_build {
|
||||
}
|
||||
}
|
||||
|
||||
-target.path = $$[QT_INSTALL_PLUGINS]/$$PLUGIN_TYPE
|
||||
+target.path = $$NIX_OUTPUT_PLUGIN/$$PLUGIN_TYPE
|
||||
INSTALLS += target
|
||||
|
||||
TARGET = $$qt5LibraryTarget($$TARGET)
|
||||
--
|
||||
2.29.3
|
||||
|
||||
@ -1,68 +0,0 @@
|
||||
From 492f6555bb09f207c83387441f0f23ba4602dfff Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@mailbox.org>
|
||||
Date: Wed, 18 Sep 2019 05:39:50 -0500
|
||||
Subject: [PATCH 04/12] qtbase-replace-libdir
|
||||
|
||||
---
|
||||
mkspecs/features/qt_common.prf | 20 ++------------------
|
||||
mkspecs/features/qt_module.prf | 5 +----
|
||||
2 files changed, 3 insertions(+), 22 deletions(-)
|
||||
|
||||
diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
|
||||
index caecb68a84..d3aa3ba570 100644
|
||||
--- a/mkspecs/features/qt_common.prf
|
||||
+++ b/mkspecs/features/qt_common.prf
|
||||
@@ -30,32 +30,16 @@ contains(TEMPLATE, .*lib) {
|
||||
rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]*
|
||||
else: \
|
||||
rplbase = $$MODULE_BASE_OUTDIR
|
||||
- host_build {
|
||||
- qqt_libdir = \$\$\$\$[QT_HOST_LIBS]
|
||||
- qt_libdir = $$[QT_HOST_LIBS]
|
||||
- } else {
|
||||
- qqt_libdir = \$\$\$\$[QT_INSTALL_LIBS]
|
||||
- qt_libdir = $$[QT_INSTALL_LIBS]
|
||||
- }
|
||||
+ qt_libdir = $$NIX_OUTPUT_OUT/lib
|
||||
contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) {
|
||||
- lib_replace0.match = $$rplbase/lib/
|
||||
- lib_replace0.replace = $$qqt_libdir/
|
||||
- lib_replace0.CONFIG = path
|
||||
- QMAKE_PRL_INSTALL_REPLACE += lib_replace0
|
||||
lib_replace.match = "[^ ']*$$rplbase/lib"
|
||||
lib_replace.replace =
|
||||
} else {
|
||||
lib_replace.match = $$rplbase/lib
|
||||
- lib_replace.replace = $$qqt_libdir
|
||||
+ lib_replace.replace = $$qt_libdir
|
||||
}
|
||||
lib_replace.CONFIG = path
|
||||
QMAKE_PRL_INSTALL_REPLACE += lib_replace
|
||||
- !equals(qt_libdir, $$rplbase/lib) {
|
||||
- qtlibdir_replace.match = $$qt_libdir
|
||||
- qtlibdir_replace.replace = $$qqt_libdir
|
||||
- qtlibdir_replace.CONFIG = path
|
||||
- QMAKE_PRL_INSTALL_REPLACE += qtlibdir_replace
|
||||
- }
|
||||
}
|
||||
|
||||
# The remainder of this file must not apply to host tools/libraries,
|
||||
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
|
||||
index ee7de22059..9015b30d73 100644
|
||||
--- a/mkspecs/features/qt_module.prf
|
||||
+++ b/mkspecs/features/qt_module.prf
|
||||
@@ -303,10 +303,7 @@ load(qt_targets)
|
||||
}
|
||||
!lib_bundle:unix {
|
||||
CONFIG += create_libtool
|
||||
- host_build: \
|
||||
- QMAKE_LIBTOOL_LIBDIR = $$[QT_HOST_LIBS]
|
||||
- else: \
|
||||
- QMAKE_LIBTOOL_LIBDIR = "=$$[QT_INSTALL_LIBS/raw]"
|
||||
+ QMAKE_LIBTOOL_LIBDIR = $$NIX_OUTPUT_OUT/lib
|
||||
!isEmpty(lib_replace0.match) {
|
||||
ltlib_replace0.match = $$lib_replace0.match
|
||||
ltlib_replace0.replace = $$QMAKE_LIBTOOL_LIBDIR/
|
||||
--
|
||||
2.23.GIT
|
||||
|
||||
@ -1,194 +0,0 @@
|
||||
From 6f53835deae80b28ec5c1c9a5c0294bbcc87f91b Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@mailbox.org>
|
||||
Date: Tue, 17 Sep 2019 05:34:28 -0500
|
||||
Subject: [PATCH 05/12] qtbase-cmake
|
||||
|
||||
---
|
||||
mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 2 +-
|
||||
mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in | 4 ++--
|
||||
src/corelib/Qt5CoreConfigExtras.cmake.in | 10 +++++-----
|
||||
src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in | 2 +-
|
||||
.../Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in | 2 +-
|
||||
src/dbus/Qt5DBusConfigExtras.cmake.in | 12 ++----------
|
||||
src/gui/Qt5GuiConfigExtras.cmake.in | 6 +++---
|
||||
src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +-
|
||||
8 files changed, 16 insertions(+), 24 deletions(-)
|
||||
|
||||
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
index c60ef16e64..e354ab9156 100644
|
||||
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
@@ -278,7 +278,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
|
||||
macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
|
||||
set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
|
||||
|
||||
- set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
|
||||
+ set(imported_location \"${PLUGIN_LOCATION}\")
|
||||
_qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
|
||||
set_target_properties(Qt5::${Plugin} PROPERTIES
|
||||
\"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
|
||||
diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
|
||||
index 5baf0fdb10..3583745aea 100644
|
||||
--- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
|
||||
+++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
|
||||
@@ -2,10 +2,10 @@
|
||||
add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
|
||||
|
||||
!!IF !isEmpty(CMAKE_RELEASE_TYPE)
|
||||
-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
|
||||
+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
|
||||
!!ENDIF
|
||||
!!IF !isEmpty(CMAKE_DEBUG_TYPE)
|
||||
-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
|
||||
+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
|
||||
!!ENDIF
|
||||
|
||||
list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
|
||||
diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
|
||||
index e0652fdcf9..450b2a2d28 100644
|
||||
--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
|
||||
+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
|
||||
@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake)
|
||||
add_executable(Qt5::qmake IMPORTED)
|
||||
|
||||
!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
|
||||
- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
|
||||
+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
|
||||
!!ELSE
|
||||
set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
|
||||
!!ENDIF
|
||||
@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc)
|
||||
add_executable(Qt5::moc IMPORTED)
|
||||
|
||||
!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
|
||||
- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
|
||||
+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
|
||||
!!ELSE
|
||||
set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
|
||||
!!ENDIF
|
||||
@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc)
|
||||
add_executable(Qt5::rcc IMPORTED)
|
||||
|
||||
!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
|
||||
- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
|
||||
+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
|
||||
!!ELSE
|
||||
set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
|
||||
!!ENDIF
|
||||
@@ -116,7 +116,7 @@ if (NOT TARGET Qt5::WinMain)
|
||||
!!IF !isEmpty(CMAKE_RELEASE_TYPE)
|
||||
set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
|
||||
!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
|
||||
- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
|
||||
+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
|
||||
!!ELSE
|
||||
set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
|
||||
!!ENDIF
|
||||
@@ -130,7 +130,7 @@ if (NOT TARGET Qt5::WinMain)
|
||||
set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
|
||||
|
||||
!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
|
||||
- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
|
||||
+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
|
||||
!!ELSE
|
||||
set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
|
||||
!!ENDIF
|
||||
diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
|
||||
index c357237d0e..6f0c75de3c 100644
|
||||
--- a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
|
||||
+++ b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
!!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE)
|
||||
-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
|
||||
+set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
|
||||
!!ELSE
|
||||
set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
|
||||
!!ENDIF
|
||||
diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
|
||||
index 706304cf34..546420f6ad 100644
|
||||
--- a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
|
||||
+++ b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
!!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE)
|
||||
-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
|
||||
+set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
|
||||
!!ELSE
|
||||
set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
|
||||
!!ENDIF
|
||||
diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in
|
||||
index 1d947159e2..b36865fc48 100644
|
||||
--- a/src/dbus/Qt5DBusConfigExtras.cmake.in
|
||||
+++ b/src/dbus/Qt5DBusConfigExtras.cmake.in
|
||||
@@ -2,11 +2,7 @@
|
||||
if (NOT TARGET Qt5::qdbuscpp2xml)
|
||||
add_executable(Qt5::qdbuscpp2xml IMPORTED)
|
||||
|
||||
-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
|
||||
- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
|
||||
-!!ELSE
|
||||
- set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
|
||||
-!!ENDIF
|
||||
+ set(imported_location \"$$NIX_OUTPUT_DEV/bin/qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
|
||||
_qt5_DBus_check_file_exists(${imported_location})
|
||||
|
||||
set_target_properties(Qt5::qdbuscpp2xml PROPERTIES
|
||||
@@ -17,11 +13,7 @@ endif()
|
||||
if (NOT TARGET Qt5::qdbusxml2cpp)
|
||||
add_executable(Qt5::qdbusxml2cpp IMPORTED)
|
||||
|
||||
-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
|
||||
- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
|
||||
-!!ELSE
|
||||
- set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
|
||||
-!!ENDIF
|
||||
+ set(imported_location \"$$NIX_OUTPUT_DEV/bin/qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
|
||||
_qt5_DBus_check_file_exists(${imported_location})
|
||||
|
||||
set_target_properties(Qt5::qdbusxml2cpp PROPERTIES
|
||||
diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in
|
||||
index 84dbbfebd4..8ad0720c5c 100644
|
||||
--- a/src/gui/Qt5GuiConfigExtras.cmake.in
|
||||
+++ b/src/gui/Qt5GuiConfigExtras.cmake.in
|
||||
@@ -2,7 +2,7 @@
|
||||
!!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE)
|
||||
|
||||
!!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
|
||||
-set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\")
|
||||
+set(Qt5Gui_EGL_INCLUDE_DIRS \"$$NIX_OUTPUT_DEV/$$CMAKE_INCLUDE_DIR/QtANGLE\")
|
||||
!!ELSE
|
||||
set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\")
|
||||
!!ENDIF
|
||||
@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_properties TargetName Configuration LIB_LOCATIO
|
||||
set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
|
||||
|
||||
!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
|
||||
- set(imported_location \"${_qt5Gui_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
|
||||
+ set(imported_location \"$$NIX_OUTPUT_OUT/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
|
||||
!!ELSE
|
||||
set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
|
||||
!!ENDIF
|
||||
|
||||
!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
|
||||
- set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
|
||||
+ set(imported_implib \"$$NIX_OUTPUT_OUT/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
|
||||
!!ELSE
|
||||
set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
|
||||
!!ENDIF
|
||||
diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
|
||||
index 99d87e2e46..a4eab2aa72 100644
|
||||
--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in
|
||||
+++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
|
||||
@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic)
|
||||
add_executable(Qt5::uic IMPORTED)
|
||||
|
||||
!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
|
||||
- set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
|
||||
+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
|
||||
!!ELSE
|
||||
set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
|
||||
!!ENDIF
|
||||
--
|
||||
2.23.GIT
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user