mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-25 22:57:29 +03:00
Merge branch 'master' of https://github.com/NixOS/nixpkgs into php-mysqlnd-m
This commit is contained in:
commit
4f3649be76
4
COPYING
4
COPYING
@ -23,9 +23,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
Note: the license above does not apply to the packages built by the
|
||||
Nix Packages collection, merely to the package descriptions (i.e., Nix
|
||||
expressions, build scripts, etc.). Also, the license does not apply
|
||||
to some of the binaries used for bootstrapping Nixpkgs (e.g.,
|
||||
pkgs/stdenv/linux/tools/bash). It also might not apply to patches
|
||||
expressions, build scripts, etc.). It also might not apply to patches
|
||||
included in Nixpkgs, which may be derivative works of the packages to
|
||||
which they apply. The aforementioned artifacts are all covered by the
|
||||
licenses of the respective packages.
|
||||
|
@ -184,7 +184,7 @@
|
||||
For now, feel free to use either method.
|
||||
</para>
|
||||
<note><para>
|
||||
There is also a "backlink" <varname>__targetPackages</varname>, yielding a package set whose <varname>buildPackages</varname> is the current package set.
|
||||
There is also a "backlink" <varname>targetPackages</varname>, yielding a package set whose <varname>buildPackages</varname> is the current package set.
|
||||
This is a hack, though, to accommodate compilers with lousy build systems.
|
||||
Please do not use this unless you are absolutely sure you are packaging such a compiler and there is no other way.
|
||||
</para></note>
|
||||
|
@ -614,6 +614,7 @@
|
||||
sztupi = "Attila Sztupak <attila.sztupak@gmail.com>";
|
||||
taeer = "Taeer Bar-Yam <taeer@necsi.edu>";
|
||||
tailhook = "Paul Colomiets <paul@colomiets.name>";
|
||||
taketwo = "Sergey Alexandrov <alexandrov88@gmail.com>";
|
||||
takikawa = "Asumu Takikawa <asumu@igalia.com>";
|
||||
taktoa = "Remy Goldschmidt <taktoa@gmail.com>";
|
||||
taku0 = "Takuo Yonezawa <mxxouy6x3m_github@tatapa.org>";
|
||||
|
@ -173,7 +173,7 @@ in
|
||||
|
||||
preStart = ''
|
||||
mkdir -p ${cfg.statePath}/{data,config,logs}
|
||||
ln -sf ${pkgs.mattermost}/{bin,fonts,i18n,templates,webapp} ${cfg.statePath}
|
||||
ln -sf ${pkgs.mattermost}/{bin,fonts,i18n,templates,client} ${cfg.statePath}
|
||||
'' + lib.optionalString (!cfg.mutableConfig) ''
|
||||
ln -sf ${mattermostConfJSON} ${cfg.statePath}/config/config.json
|
||||
'' + lib.optionalString cfg.mutableConfig ''
|
||||
|
@ -221,7 +221,7 @@ in {
|
||||
};
|
||||
|
||||
extraOptions = mkOption {
|
||||
type = types.str;
|
||||
type = types.lines;
|
||||
default = "";
|
||||
example = ''
|
||||
unredir-if-possible = true;
|
||||
|
@ -924,6 +924,14 @@ in
|
||||
(flip map interfaces (i: {
|
||||
assertion = i.subnetMask == null;
|
||||
message = "The networking.interfaces.${i.name}.subnetMask option is defunct. Use prefixLength instead.";
|
||||
})) ++ (flip map interfaces (i: {
|
||||
# With the linux kernel, interface name length is limited by IFNAMSIZ
|
||||
# to 16 bytes, including the trailing null byte.
|
||||
# See include/linux/if.h in the kernel sources
|
||||
assertion = stringLength i.name < 16;
|
||||
message = ''
|
||||
The name of networking.interfaces."${i.name}" is too long, it needs to be less than 16 characters.
|
||||
'';
|
||||
})) ++ (flip map slaveIfs (i: {
|
||||
assertion = i.ip4 == [ ] && i.ipAddress == null && i.ip6 == [ ] && i.ipv6Address == null;
|
||||
message = "The networking.interfaces.${i.name} must not have any defined ips when it is a slave.";
|
||||
|
@ -24,9 +24,7 @@ rec {
|
||||
buildEclipsePluginBase (attrs // {
|
||||
srcs = [ srcFeature srcPlugin ];
|
||||
|
||||
phases = [ "installPhase" ];
|
||||
|
||||
installPhase = ''
|
||||
buildCommand = ''
|
||||
dropinDir="$out/eclipse/dropins/${name}"
|
||||
|
||||
mkdir -p $dropinDir/features
|
||||
@ -35,7 +33,6 @@ rec {
|
||||
mkdir -p $dropinDir/plugins
|
||||
cp -v ${srcPlugin} $dropinDir/plugins/${name}.jar
|
||||
'';
|
||||
|
||||
});
|
||||
|
||||
# Helper for the case where the build directory has the layout of an
|
||||
@ -44,7 +41,8 @@ rec {
|
||||
# directories will be installed.
|
||||
buildEclipseUpdateSite = { name, ... } @ attrs:
|
||||
buildEclipsePluginBase (attrs // {
|
||||
phases = [ "unpackPhase" "installPhase" ];
|
||||
dontBuild = true;
|
||||
doCheck = false;
|
||||
|
||||
installPhase = ''
|
||||
dropinDir="$out/eclipse/dropins/${name}"
|
||||
|
@ -0,0 +1,23 @@
|
||||
{ fetchurl, stdenv, melpaBuild }:
|
||||
|
||||
melpaBuild {
|
||||
pname = "font-lock-plus";
|
||||
version = "20170222.1755";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.emacswiki.org/emacs/download/font-lock+.el";
|
||||
sha256 = "0iajkgh0n3pbrwwxx9rmrrwz8dw2m7jsp4mggnhq7zsb20ighs30";
|
||||
name = "font-lock+.el";
|
||||
};
|
||||
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/font-lock+";
|
||||
sha256 = "1wn99cb53ykds87lg9mrlfpalrmjj177nwskrnp9wglyqs65lk4g";
|
||||
name = "font-lock-plus";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://melpa.org/#/font-lock+";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
};
|
||||
}
|
@ -1,7 +1,7 @@
|
||||
{ config, stdenv, fetchgit, makeWrapper, gnome3, at_spi2_core, libcxx,
|
||||
boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre,
|
||||
libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts,
|
||||
coreutils, glibc, dbus_libs, openssl, libxml2, gnumake, binutils, ctags }:
|
||||
coreutils, glibc, dbus_libs, openssl, libxml2, gnumake, ctags }:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
|
||||
postInstall = ''
|
||||
mv $out/bin/juci $out/bin/.juci
|
||||
makeWrapper "$out/bin/.juci" "$out/bin/juci" \
|
||||
--set PATH "${stdenv.lib.makeBinPath [ ctags coreutils llvmPackages.clang.cc cmake gnumake binutils llvmPackages.clang ]}" \
|
||||
--set PATH "${stdenv.lib.makeBinPath [ ctags coreutils llvmPackages.clang.cc cmake gnumake llvmPackages.clang.bintools llvmPackages.clang ]}" \
|
||||
--set NO_AT_BRIDGE 1 \
|
||||
--set ASPELL_CONF "dict-dir ${aspellDicts.en}/lib/aspell"
|
||||
'';
|
||||
|
@ -5,22 +5,16 @@ let
|
||||
name = "zed-${version}";
|
||||
version = "1.1.0";
|
||||
|
||||
# When upgrading node.nix / node packages:
|
||||
# fetch package.json from Zed's repository
|
||||
# run `npm2nix package.json node.nix`
|
||||
# and replace node.nix with new one
|
||||
nodePackages = import ../../../../pkgs/top-level/node-packages.nix {
|
||||
nodePackages = import ./node.nix {
|
||||
inherit pkgs;
|
||||
inherit (pkgs) stdenv nodejs fetchurl fetchgit;
|
||||
neededNatives = [ pkgs.python ] ++ pkgs.lib.optional pkgs.stdenv.isLinux pkgs.utillinux;
|
||||
self = nodePackages;
|
||||
generated = ./node.nix;
|
||||
system = stdenv.system;
|
||||
};
|
||||
|
||||
node_env = buildEnv {
|
||||
name = "node_env";
|
||||
paths = [ nodePackages."body-parser" nodePackages.express
|
||||
nodePackages.request nodePackages.tar nodePackages.ws ];
|
||||
paths = [ nodePackages."body-parser-~1.6.3" nodePackages."express-~4.8.3"
|
||||
nodePackages."request-~2.34.0" nodePackages."tar-~0.1.19"
|
||||
nodePackages."ws-~0.4.32" ];
|
||||
pathsToLink = [ "/lib" ];
|
||||
ignoreCollisions = true;
|
||||
};
|
||||
@ -78,11 +72,11 @@ in stdenv.mkDerivation rec {
|
||||
ln -s ${zed_script} $out/bin/zed
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "A fully offline-capable, open source, keyboard-focused, text and code editor for power users";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
license = licenses.mit;
|
||||
homepage = http://zedapp.org/;
|
||||
maintainers = [ stdenv.lib.maintainers.matejc ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = with maintainers; [ matejc ma27 ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
6
pkgs/applications/editors/zed/deps.json
Normal file
6
pkgs/applications/editors/zed/deps.json
Normal file
@ -0,0 +1,6 @@
|
||||
[ { "body-parser": "~1.6.3" }
|
||||
, { "express": "~4.8.3" }
|
||||
, { "request": "~2.34.0" }
|
||||
, { "tar": "~0.1.19" }
|
||||
, { "ws": "~0.4.32" }
|
||||
]
|
7
pkgs/applications/editors/zed/deps.sh
Executable file
7
pkgs/applications/editors/zed/deps.sh
Executable file
@ -0,0 +1,7 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p nodePackages.node2nix
|
||||
|
||||
node2nix -6 -i deps.json \
|
||||
-e ../../../development/node-packages/node-env.nix \
|
||||
--no-copy-node-env \
|
||||
-c node.nix
|
877
pkgs/applications/editors/zed/node-packages.nix
Normal file
877
pkgs/applications/editors/zed/node-packages.nix
Normal file
@ -0,0 +1,877 @@
|
||||
# This file has been generated by node2nix 1.3.0. Do not edit!
|
||||
|
||||
{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
|
||||
|
||||
let
|
||||
sources = {
|
||||
"bytes-1.0.0" = {
|
||||
name = "bytes";
|
||||
packageName = "bytes";
|
||||
version = "1.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz";
|
||||
sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8";
|
||||
};
|
||||
};
|
||||
"depd-0.4.4" = {
|
||||
name = "depd";
|
||||
packageName = "depd";
|
||||
version = "0.4.4";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/depd/-/depd-0.4.4.tgz";
|
||||
sha1 = "07091fae75f97828d89b4a02a2d4778f0e7c0662";
|
||||
};
|
||||
};
|
||||
"iconv-lite-0.4.4" = {
|
||||
name = "iconv-lite";
|
||||
packageName = "iconv-lite";
|
||||
version = "0.4.4";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.4.tgz";
|
||||
sha1 = "e95f2e41db0735fc21652f7827a5ee32e63c83a8";
|
||||
};
|
||||
};
|
||||
"media-typer-0.2.0" = {
|
||||
name = "media-typer";
|
||||
packageName = "media-typer";
|
||||
version = "0.2.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/media-typer/-/media-typer-0.2.0.tgz";
|
||||
sha1 = "d8a065213adfeaa2e76321a2b6dda36ff6335984";
|
||||
};
|
||||
};
|
||||
"on-finished-2.1.0" = {
|
||||
name = "on-finished";
|
||||
packageName = "on-finished";
|
||||
version = "2.1.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/on-finished/-/on-finished-2.1.0.tgz";
|
||||
sha1 = "0c539f09291e8ffadde0c8a25850fb2cedc7022d";
|
||||
};
|
||||
};
|
||||
"qs-2.2.2" = {
|
||||
name = "qs";
|
||||
packageName = "qs";
|
||||
version = "2.2.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/qs/-/qs-2.2.2.tgz";
|
||||
sha1 = "dfe783f1854b1ac2b3ade92775ad03e27e03218c";
|
||||
};
|
||||
};
|
||||
"raw-body-1.3.0" = {
|
||||
name = "raw-body";
|
||||
packageName = "raw-body";
|
||||
version = "1.3.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/raw-body/-/raw-body-1.3.0.tgz";
|
||||
sha1 = "978230a156a5548f42eef14de22d0f4f610083d1";
|
||||
};
|
||||
};
|
||||
"type-is-1.3.2" = {
|
||||
name = "type-is";
|
||||
packageName = "type-is";
|
||||
version = "1.3.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/type-is/-/type-is-1.3.2.tgz";
|
||||
sha1 = "4f2a5dc58775ca1630250afc7186f8b36309d1bb";
|
||||
};
|
||||
};
|
||||
"ee-first-1.0.5" = {
|
||||
name = "ee-first";
|
||||
packageName = "ee-first";
|
||||
version = "1.0.5";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/ee-first/-/ee-first-1.0.5.tgz";
|
||||
sha1 = "8c9b212898d8cd9f1a9436650ce7be202c9e9ff0";
|
||||
};
|
||||
};
|
||||
"mime-types-1.0.2" = {
|
||||
name = "mime-types";
|
||||
packageName = "mime-types";
|
||||
version = "1.0.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz";
|
||||
sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce";
|
||||
};
|
||||
};
|
||||
"accepts-1.0.7" = {
|
||||
name = "accepts";
|
||||
packageName = "accepts";
|
||||
version = "1.0.7";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/accepts/-/accepts-1.0.7.tgz";
|
||||
sha1 = "5b501fb4f0704309964ccdb048172541208dab1a";
|
||||
};
|
||||
};
|
||||
"buffer-crc32-0.2.3" = {
|
||||
name = "buffer-crc32";
|
||||
packageName = "buffer-crc32";
|
||||
version = "0.2.3";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.3.tgz";
|
||||
sha1 = "bb54519e95d107cbd2400e76d0cab1467336d921";
|
||||
};
|
||||
};
|
||||
"debug-1.0.4" = {
|
||||
name = "debug";
|
||||
packageName = "debug";
|
||||
version = "1.0.4";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz";
|
||||
sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8";
|
||||
};
|
||||
};
|
||||
"escape-html-1.0.1" = {
|
||||
name = "escape-html";
|
||||
packageName = "escape-html";
|
||||
version = "1.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz";
|
||||
sha1 = "181a286ead397a39a92857cfb1d43052e356bff0";
|
||||
};
|
||||
};
|
||||
"finalhandler-0.1.0" = {
|
||||
name = "finalhandler";
|
||||
packageName = "finalhandler";
|
||||
version = "0.1.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz";
|
||||
sha1 = "da05bbc4f5f4a30c84ce1d91f3c154007c4e9daa";
|
||||
};
|
||||
};
|
||||
"methods-1.1.0" = {
|
||||
name = "methods";
|
||||
packageName = "methods";
|
||||
version = "1.1.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/methods/-/methods-1.1.0.tgz";
|
||||
sha1 = "5dca4ee12df52ff3b056145986a8f01cbc86436f";
|
||||
};
|
||||
};
|
||||
"parseurl-1.3.2" = {
|
||||
name = "parseurl";
|
||||
packageName = "parseurl";
|
||||
version = "1.3.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz";
|
||||
sha1 = "fc289d4ed8993119460c156253262cdc8de65bf3";
|
||||
};
|
||||
};
|
||||
"path-to-regexp-0.1.3" = {
|
||||
name = "path-to-regexp";
|
||||
packageName = "path-to-regexp";
|
||||
version = "0.1.3";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz";
|
||||
sha1 = "21b9ab82274279de25b156ea08fd12ca51b8aecb";
|
||||
};
|
||||
};
|
||||
"proxy-addr-1.0.1" = {
|
||||
name = "proxy-addr";
|
||||
packageName = "proxy-addr";
|
||||
version = "1.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.1.tgz";
|
||||
sha1 = "c7c566d5eb4e3fad67eeb9c77c5558ccc39b88a8";
|
||||
};
|
||||
};
|
||||
"range-parser-1.0.0" = {
|
||||
name = "range-parser";
|
||||
packageName = "range-parser";
|
||||
version = "1.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/range-parser/-/range-parser-1.0.0.tgz";
|
||||
sha1 = "a4b264cfe0be5ce36abe3765ac9c2a248746dbc0";
|
||||
};
|
||||
};
|
||||
"send-0.8.5" = {
|
||||
name = "send";
|
||||
packageName = "send";
|
||||
version = "0.8.5";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/send/-/send-0.8.5.tgz";
|
||||
sha1 = "37f708216e6f50c175e74c69fec53484e2fd82c7";
|
||||
};
|
||||
};
|
||||
"serve-static-1.5.4" = {
|
||||
name = "serve-static";
|
||||
packageName = "serve-static";
|
||||
version = "1.5.4";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/serve-static/-/serve-static-1.5.4.tgz";
|
||||
sha1 = "819fb37ae46bd02dd520b77fcf7fd8f5112f9782";
|
||||
};
|
||||
};
|
||||
"vary-0.1.0" = {
|
||||
name = "vary";
|
||||
packageName = "vary";
|
||||
version = "0.1.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/vary/-/vary-0.1.0.tgz";
|
||||
sha1 = "df0945899e93c0cc5bd18cc8321d9d21e74f6176";
|
||||
};
|
||||
};
|
||||
"cookie-0.1.2" = {
|
||||
name = "cookie";
|
||||
packageName = "cookie";
|
||||
version = "0.1.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz";
|
||||
sha1 = "72fec3d24e48a3432073d90c12642005061004b1";
|
||||
};
|
||||
};
|
||||
"fresh-0.2.2" = {
|
||||
name = "fresh";
|
||||
packageName = "fresh";
|
||||
version = "0.2.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/fresh/-/fresh-0.2.2.tgz";
|
||||
sha1 = "9731dcf5678c7faeb44fb903c4f72df55187fa77";
|
||||
};
|
||||
};
|
||||
"cookie-signature-1.0.4" = {
|
||||
name = "cookie-signature";
|
||||
packageName = "cookie-signature";
|
||||
version = "1.0.4";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.4.tgz";
|
||||
sha1 = "0edd22286e3a111b9a2a70db363e925e867f6aca";
|
||||
};
|
||||
};
|
||||
"merge-descriptors-0.0.2" = {
|
||||
name = "merge-descriptors";
|
||||
packageName = "merge-descriptors";
|
||||
version = "0.0.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz";
|
||||
sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7";
|
||||
};
|
||||
};
|
||||
"utils-merge-1.0.0" = {
|
||||
name = "utils-merge";
|
||||
packageName = "utils-merge";
|
||||
version = "1.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz";
|
||||
sha1 = "0294fb922bb9375153541c4f7096231f287c8af8";
|
||||
};
|
||||
};
|
||||
"negotiator-0.4.7" = {
|
||||
name = "negotiator";
|
||||
packageName = "negotiator";
|
||||
version = "0.4.7";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/negotiator/-/negotiator-0.4.7.tgz";
|
||||
sha1 = "a4160f7177ec806738631d0d3052325da42abdc8";
|
||||
};
|
||||
};
|
||||
"ms-0.6.2" = {
|
||||
name = "ms";
|
||||
packageName = "ms";
|
||||
version = "0.6.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz";
|
||||
sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c";
|
||||
};
|
||||
};
|
||||
"ipaddr.js-0.1.2" = {
|
||||
name = "ipaddr.js";
|
||||
packageName = "ipaddr.js";
|
||||
version = "0.1.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.2.tgz";
|
||||
sha1 = "6a1fd3d854f5002965c34d7bbcd9b4a8d4b0467e";
|
||||
};
|
||||
};
|
||||
"destroy-1.0.3" = {
|
||||
name = "destroy";
|
||||
packageName = "destroy";
|
||||
version = "1.0.3";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz";
|
||||
sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9";
|
||||
};
|
||||
};
|
||||
"mime-1.2.11" = {
|
||||
name = "mime";
|
||||
packageName = "mime";
|
||||
version = "1.2.11";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
|
||||
sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
|
||||
};
|
||||
};
|
||||
"qs-0.6.6" = {
|
||||
name = "qs";
|
||||
packageName = "qs";
|
||||
version = "0.6.6";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz";
|
||||
sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107";
|
||||
};
|
||||
};
|
||||
"json-stringify-safe-5.0.1" = {
|
||||
name = "json-stringify-safe";
|
||||
packageName = "json-stringify-safe";
|
||||
version = "5.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
|
||||
sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
|
||||
};
|
||||
};
|
||||
"forever-agent-0.5.2" = {
|
||||
name = "forever-agent";
|
||||
packageName = "forever-agent";
|
||||
version = "0.5.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz";
|
||||
sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130";
|
||||
};
|
||||
};
|
||||
"node-uuid-1.4.8" = {
|
||||
name = "node-uuid";
|
||||
packageName = "node-uuid";
|
||||
version = "1.4.8";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz";
|
||||
sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907";
|
||||
};
|
||||
};
|
||||
"tough-cookie-2.3.3" = {
|
||||
name = "tough-cookie";
|
||||
packageName = "tough-cookie";
|
||||
version = "2.3.3";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz";
|
||||
sha1 = "0b618a5565b6dea90bf3425d04d55edc475a7561";
|
||||
};
|
||||
};
|
||||
"form-data-0.1.4" = {
|
||||
name = "form-data";
|
||||
packageName = "form-data";
|
||||
version = "0.1.4";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz";
|
||||
sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12";
|
||||
};
|
||||
};
|
||||
"tunnel-agent-0.3.0" = {
|
||||
name = "tunnel-agent";
|
||||
packageName = "tunnel-agent";
|
||||
version = "0.3.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz";
|
||||
sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee";
|
||||
};
|
||||
};
|
||||
"http-signature-0.10.1" = {
|
||||
name = "http-signature";
|
||||
packageName = "http-signature";
|
||||
version = "0.10.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz";
|
||||
sha1 = "4fbdac132559aa8323121e540779c0a012b27e66";
|
||||
};
|
||||
};
|
||||
"oauth-sign-0.3.0" = {
|
||||
name = "oauth-sign";
|
||||
packageName = "oauth-sign";
|
||||
version = "0.3.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz";
|
||||
sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e";
|
||||
};
|
||||
};
|
||||
"hawk-1.0.0" = {
|
||||
name = "hawk";
|
||||
packageName = "hawk";
|
||||
version = "1.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz";
|
||||
sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d";
|
||||
};
|
||||
};
|
||||
"aws-sign2-0.5.0" = {
|
||||
name = "aws-sign2";
|
||||
packageName = "aws-sign2";
|
||||
version = "0.5.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz";
|
||||
sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63";
|
||||
};
|
||||
};
|
||||
"punycode-1.4.1" = {
|
||||
name = "punycode";
|
||||
packageName = "punycode";
|
||||
version = "1.4.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz";
|
||||
sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
|
||||
};
|
||||
};
|
||||
"combined-stream-0.0.7" = {
|
||||
name = "combined-stream";
|
||||
packageName = "combined-stream";
|
||||
version = "0.0.7";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz";
|
||||
sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f";
|
||||
};
|
||||
};
|
||||
"async-0.9.2" = {
|
||||
name = "async";
|
||||
packageName = "async";
|
||||
version = "0.9.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz";
|
||||
sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d";
|
||||
};
|
||||
};
|
||||
"delayed-stream-0.0.5" = {
|
||||
name = "delayed-stream";
|
||||
packageName = "delayed-stream";
|
||||
version = "0.0.5";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";
|
||||
sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f";
|
||||
};
|
||||
};
|
||||
"assert-plus-0.1.5" = {
|
||||
name = "assert-plus";
|
||||
packageName = "assert-plus";
|
||||
version = "0.1.5";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz";
|
||||
sha1 = "ee74009413002d84cec7219c6ac811812e723160";
|
||||
};
|
||||
};
|
||||
"asn1-0.1.11" = {
|
||||
name = "asn1";
|
||||
packageName = "asn1";
|
||||
version = "0.1.11";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
|
||||
sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7";
|
||||
};
|
||||
};
|
||||
"ctype-0.5.3" = {
|
||||
name = "ctype";
|
||||
packageName = "ctype";
|
||||
version = "0.5.3";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz";
|
||||
sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f";
|
||||
};
|
||||
};
|
||||
"hoek-0.9.1" = {
|
||||
name = "hoek";
|
||||
packageName = "hoek";
|
||||
version = "0.9.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz";
|
||||
sha1 = "3d322462badf07716ea7eb85baf88079cddce505";
|
||||
};
|
||||
};
|
||||
"boom-0.4.2" = {
|
||||
name = "boom";
|
||||
packageName = "boom";
|
||||
version = "0.4.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz";
|
||||
sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b";
|
||||
};
|
||||
};
|
||||
"cryptiles-0.2.2" = {
|
||||
name = "cryptiles";
|
||||
packageName = "cryptiles";
|
||||
version = "0.2.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz";
|
||||
sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c";
|
||||
};
|
||||
};
|
||||
"sntp-0.2.4" = {
|
||||
name = "sntp";
|
||||
packageName = "sntp";
|
||||
version = "0.2.4";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz";
|
||||
sha1 = "fb885f18b0f3aad189f824862536bceeec750900";
|
||||
};
|
||||
};
|
||||
"block-stream-0.0.9" = {
|
||||
name = "block-stream";
|
||||
packageName = "block-stream";
|
||||
version = "0.0.9";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz";
|
||||
sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a";
|
||||
};
|
||||
};
|
||||
"fstream-0.1.31" = {
|
||||
name = "fstream";
|
||||
packageName = "fstream";
|
||||
version = "0.1.31";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz";
|
||||
sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988";
|
||||
};
|
||||
};
|
||||
"inherits-2.0.3" = {
|
||||
name = "inherits";
|
||||
packageName = "inherits";
|
||||
version = "2.0.3";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
|
||||
sha1 = "633c2c83e3da42a502f52466022480f4208261de";
|
||||
};
|
||||
};
|
||||
"graceful-fs-3.0.11" = {
|
||||
name = "graceful-fs";
|
||||
packageName = "graceful-fs";
|
||||
version = "3.0.11";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz";
|
||||
sha1 = "7613c778a1afea62f25c630a086d7f3acbbdd818";
|
||||
};
|
||||
};
|
||||
"mkdirp-0.5.1" = {
|
||||
name = "mkdirp";
|
||||
packageName = "mkdirp";
|
||||
version = "0.5.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
|
||||
sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
|
||||
};
|
||||
};
|
||||
"rimraf-2.6.2" = {
|
||||
name = "rimraf";
|
||||
packageName = "rimraf";
|
||||
version = "2.6.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz";
|
||||
sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn";
|
||||
};
|
||||
};
|
||||
"natives-1.1.0" = {
|
||||
name = "natives";
|
||||
packageName = "natives";
|
||||
version = "1.1.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/natives/-/natives-1.1.0.tgz";
|
||||
sha1 = "e9ff841418a6b2ec7a495e939984f78f163e6e31";
|
||||
};
|
||||
};
|
||||
"minimist-0.0.8" = {
|
||||
name = "minimist";
|
||||
packageName = "minimist";
|
||||
version = "0.0.8";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
|
||||
sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
|
||||
};
|
||||
};
|
||||
"glob-7.1.2" = {
|
||||
name = "glob";
|
||||
packageName = "glob";
|
||||
version = "7.1.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz";
|
||||
sha512 = "08vjxzixc9dwc1hn5pd60yyij98krk2pr758aiga97r02ncvaqx1hidi95wk470k1v84gg4alls9bm52m77174z128bgf13b61x951h";
|
||||
};
|
||||
};
|
||||
"fs.realpath-1.0.0" = {
|
||||
name = "fs.realpath";
|
||||
packageName = "fs.realpath";
|
||||
version = "1.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz";
|
||||
sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
|
||||
};
|
||||
};
|
||||
"inflight-1.0.6" = {
|
||||
name = "inflight";
|
||||
packageName = "inflight";
|
||||
version = "1.0.6";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz";
|
||||
sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9";
|
||||
};
|
||||
};
|
||||
"minimatch-3.0.4" = {
|
||||
name = "minimatch";
|
||||
packageName = "minimatch";
|
||||
version = "3.0.4";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
|
||||
sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8";
|
||||
};
|
||||
};
|
||||
"once-1.4.0" = {
|
||||
name = "once";
|
||||
packageName = "once";
|
||||
version = "1.4.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz";
|
||||
sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
|
||||
};
|
||||
};
|
||||
"path-is-absolute-1.0.1" = {
|
||||
name = "path-is-absolute";
|
||||
packageName = "path-is-absolute";
|
||||
version = "1.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
|
||||
sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
|
||||
};
|
||||
};
|
||||
"wrappy-1.0.2" = {
|
||||
name = "wrappy";
|
||||
packageName = "wrappy";
|
||||
version = "1.0.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz";
|
||||
sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
|
||||
};
|
||||
};
|
||||
"brace-expansion-1.1.8" = {
|
||||
name = "brace-expansion";
|
||||
packageName = "brace-expansion";
|
||||
version = "1.1.8";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz";
|
||||
sha1 = "c07b211c7c952ec1f8efd51a77ef0d1d3990a292";
|
||||
};
|
||||
};
|
||||
"balanced-match-1.0.0" = {
|
||||
name = "balanced-match";
|
||||
packageName = "balanced-match";
|
||||
version = "1.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz";
|
||||
sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
|
||||
};
|
||||
};
|
||||
"concat-map-0.0.1" = {
|
||||
name = "concat-map";
|
||||
packageName = "concat-map";
|
||||
version = "0.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
|
||||
sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
|
||||
};
|
||||
};
|
||||
"commander-2.1.0" = {
|
||||
name = "commander";
|
||||
packageName = "commander";
|
||||
version = "2.1.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz";
|
||||
sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781";
|
||||
};
|
||||
};
|
||||
"nan-1.0.0" = {
|
||||
name = "nan";
|
||||
packageName = "nan";
|
||||
version = "1.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/nan/-/nan-1.0.0.tgz";
|
||||
sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38";
|
||||
};
|
||||
};
|
||||
"tinycolor-0.0.1" = {
|
||||
name = "tinycolor";
|
||||
packageName = "tinycolor";
|
||||
version = "0.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz";
|
||||
sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164";
|
||||
};
|
||||
};
|
||||
"options-0.0.6" = {
|
||||
name = "options";
|
||||
packageName = "options";
|
||||
version = "0.0.6";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/options/-/options-0.0.6.tgz";
|
||||
sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f";
|
||||
};
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
"body-parser-~1.6.3" = nodeEnv.buildNodePackage {
|
||||
name = "body-parser";
|
||||
packageName = "body-parser";
|
||||
version = "1.6.7";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/body-parser/-/body-parser-1.6.7.tgz";
|
||||
sha1 = "82306becadf44543e826b3907eae93f0237c4e5c";
|
||||
};
|
||||
dependencies = [
|
||||
sources."bytes-1.0.0"
|
||||
sources."depd-0.4.4"
|
||||
sources."iconv-lite-0.4.4"
|
||||
sources."media-typer-0.2.0"
|
||||
sources."on-finished-2.1.0"
|
||||
sources."qs-2.2.2"
|
||||
sources."raw-body-1.3.0"
|
||||
sources."type-is-1.3.2"
|
||||
sources."ee-first-1.0.5"
|
||||
sources."mime-types-1.0.2"
|
||||
];
|
||||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
description = "Node.js body parsing middleware";
|
||||
homepage = https://github.com/expressjs/body-parser;
|
||||
license = "MIT";
|
||||
};
|
||||
production = true;
|
||||
};
|
||||
"express-~4.8.3" = nodeEnv.buildNodePackage {
|
||||
name = "express";
|
||||
packageName = "express";
|
||||
version = "4.8.8";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/express/-/express-4.8.8.tgz";
|
||||
sha1 = "6aba348ccdfa87608040b12ca0010107a0aac28e";
|
||||
};
|
||||
dependencies = [
|
||||
sources."accepts-1.0.7"
|
||||
sources."buffer-crc32-0.2.3"
|
||||
sources."debug-1.0.4"
|
||||
sources."depd-0.4.4"
|
||||
sources."escape-html-1.0.1"
|
||||
sources."finalhandler-0.1.0"
|
||||
sources."media-typer-0.2.0"
|
||||
sources."methods-1.1.0"
|
||||
sources."parseurl-1.3.2"
|
||||
sources."path-to-regexp-0.1.3"
|
||||
sources."proxy-addr-1.0.1"
|
||||
sources."qs-2.2.2"
|
||||
sources."range-parser-1.0.0"
|
||||
sources."send-0.8.5"
|
||||
sources."serve-static-1.5.4"
|
||||
sources."type-is-1.3.2"
|
||||
sources."vary-0.1.0"
|
||||
sources."cookie-0.1.2"
|
||||
sources."fresh-0.2.2"
|
||||
sources."cookie-signature-1.0.4"
|
||||
sources."merge-descriptors-0.0.2"
|
||||
sources."utils-merge-1.0.0"
|
||||
sources."mime-types-1.0.2"
|
||||
sources."negotiator-0.4.7"
|
||||
sources."ms-0.6.2"
|
||||
sources."ipaddr.js-0.1.2"
|
||||
sources."destroy-1.0.3"
|
||||
sources."mime-1.2.11"
|
||||
sources."on-finished-2.1.0"
|
||||
sources."ee-first-1.0.5"
|
||||
];
|
||||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
description = "Fast, unopinionated, minimalist web framework";
|
||||
homepage = http://expressjs.com/;
|
||||
license = "MIT";
|
||||
};
|
||||
production = true;
|
||||
};
|
||||
"request-~2.34.0" = nodeEnv.buildNodePackage {
|
||||
name = "request";
|
||||
packageName = "request";
|
||||
version = "2.34.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/request/-/request-2.34.0.tgz";
|
||||
sha1 = "b5d8b9526add4a2d4629f4d417124573996445ae";
|
||||
};
|
||||
dependencies = [
|
||||
sources."qs-0.6.6"
|
||||
sources."json-stringify-safe-5.0.1"
|
||||
sources."forever-agent-0.5.2"
|
||||
sources."node-uuid-1.4.8"
|
||||
sources."mime-1.2.11"
|
||||
sources."tough-cookie-2.3.3"
|
||||
sources."form-data-0.1.4"
|
||||
sources."tunnel-agent-0.3.0"
|
||||
sources."http-signature-0.10.1"
|
||||
sources."oauth-sign-0.3.0"
|
||||
sources."hawk-1.0.0"
|
||||
sources."aws-sign2-0.5.0"
|
||||
sources."punycode-1.4.1"
|
||||
sources."combined-stream-0.0.7"
|
||||
sources."async-0.9.2"
|
||||
sources."delayed-stream-0.0.5"
|
||||
sources."assert-plus-0.1.5"
|
||||
sources."asn1-0.1.11"
|
||||
sources."ctype-0.5.3"
|
||||
sources."hoek-0.9.1"
|
||||
sources."boom-0.4.2"
|
||||
sources."cryptiles-0.2.2"
|
||||
sources."sntp-0.2.4"
|
||||
];
|
||||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
description = "Simplified HTTP request client.";
|
||||
homepage = https://github.com/mikeal/request;
|
||||
license = "Apache, Version 2.0";
|
||||
};
|
||||
production = true;
|
||||
};
|
||||
"tar-~0.1.19" = nodeEnv.buildNodePackage {
|
||||
name = "tar";
|
||||
packageName = "tar";
|
||||
version = "0.1.20";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/tar/-/tar-0.1.20.tgz";
|
||||
sha1 = "42940bae5b5f22c74483699126f9f3f27449cb13";
|
||||
};
|
||||
dependencies = [
|
||||
sources."block-stream-0.0.9"
|
||||
sources."fstream-0.1.31"
|
||||
sources."inherits-2.0.3"
|
||||
sources."graceful-fs-3.0.11"
|
||||
sources."mkdirp-0.5.1"
|
||||
sources."rimraf-2.6.2"
|
||||
sources."natives-1.1.0"
|
||||
sources."minimist-0.0.8"
|
||||
sources."glob-7.1.2"
|
||||
sources."fs.realpath-1.0.0"
|
||||
sources."inflight-1.0.6"
|
||||
sources."minimatch-3.0.4"
|
||||
sources."once-1.4.0"
|
||||
sources."path-is-absolute-1.0.1"
|
||||
sources."wrappy-1.0.2"
|
||||
sources."brace-expansion-1.1.8"
|
||||
sources."balanced-match-1.0.0"
|
||||
sources."concat-map-0.0.1"
|
||||
];
|
||||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
description = "tar for node";
|
||||
homepage = https://github.com/isaacs/node-tar;
|
||||
license = "BSD";
|
||||
};
|
||||
production = true;
|
||||
};
|
||||
"ws-~0.4.32" = nodeEnv.buildNodePackage {
|
||||
name = "ws";
|
||||
packageName = "ws";
|
||||
version = "0.4.32";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/ws/-/ws-0.4.32.tgz";
|
||||
sha1 = "787a6154414f3c99ed83c5772153b20feb0cec32";
|
||||
};
|
||||
dependencies = [
|
||||
sources."commander-2.1.0"
|
||||
sources."nan-1.0.0"
|
||||
sources."tinycolor-0.0.1"
|
||||
sources."options-0.0.6"
|
||||
];
|
||||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
description = "simple to use, blazing fast and thoroughly tested websocket client, server and console for node.js, up-to-date against RFC-6455";
|
||||
homepage = https://github.com/einaros/ws;
|
||||
};
|
||||
production = true;
|
||||
};
|
||||
}
|
File diff suppressed because it is too large
Load Diff
@ -2,7 +2,6 @@
|
||||
, lib
|
||||
, extra-cmake-modules
|
||||
, kdoctools
|
||||
, qtscript
|
||||
, kactivities
|
||||
, kconfig
|
||||
, kcrash
|
||||
@ -27,7 +26,10 @@
|
||||
, kfilemetadata
|
||||
, ffmpeg
|
||||
, phonon-backend-gstreamer
|
||||
, qtdeclarative
|
||||
, qtquickcontrols
|
||||
, qtscript
|
||||
, qtwebkit
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
@ -56,8 +58,10 @@ mkDerivation {
|
||||
ktextwidgets
|
||||
mlt
|
||||
phonon-backend-gstreamer
|
||||
qtdeclarative
|
||||
qtquickcontrols
|
||||
qtscript
|
||||
qtwebkit
|
||||
shared_mime_info
|
||||
libv4l
|
||||
ffmpeg
|
||||
|
@ -6,7 +6,7 @@
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "keepassx-community-${version}";
|
||||
name = "keepassxc-${version}";
|
||||
version = "2.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
@ -18,11 +18,6 @@ stdenv.mkDerivation rec {
|
||||
hunspell makeWrapper # enchant
|
||||
];
|
||||
|
||||
# bogus configure script tests
|
||||
preConfigure = ''
|
||||
NIX_CFLAGS_COMPILE+=" $(pkg-config --cflags Qt5Core)"
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--enable-qt5"
|
||||
#"--without-included-boost"
|
||||
|
@ -2,11 +2,11 @@
|
||||
, desktop_file_utils, libSM, imagemagick }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.7.99";
|
||||
version = "17.10";
|
||||
name = "mediainfo-gui-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
|
||||
sha256 = "127d6wsrq3wg3ibbb28m26wrm54qbkv8h8xycanvml6ys4zqsc6a";
|
||||
sha256 = "1yvh4r19kk3bzzgnr4ikrjxqldr6860s35sh4bqr51c7l77k048c";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
sourceRoot = "./MediaInfo/Project/GNU/GUI/";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Supplies technical and tag information about a video or audio file (GUI version)";
|
||||
longDescription = ''
|
||||
|
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.7.99";
|
||||
version = "17.10";
|
||||
name = "mediainfo-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
|
||||
sha256 = "127d6wsrq3wg3ibbb28m26wrm54qbkv8h8xycanvml6ys4zqsc6a";
|
||||
sha256 = "1yvh4r19kk3bzzgnr4ikrjxqldr6860s35sh4bqr51c7l77k048c";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
configureFlags = [ "--with-libmediainfo=${libmediainfo}" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Supplies technical and tag information about a video or audio file";
|
||||
longDescription = ''
|
||||
|
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
version = "2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.suckless.org/surf/surf-${version}.tar.gz";
|
||||
url = "https://dl.suckless.org/surf/surf-${version}.tar.gz";
|
||||
sha256 = "07cmajyafljigy10d21kkyvv5jf3hxkx06pz3rwwk3y3c9x4rvps";
|
||||
};
|
||||
|
||||
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
possible to embed it in another application. Furthermore, one can point
|
||||
surf to another URI by setting its XProperties.
|
||||
'';
|
||||
homepage = http://surf.suckless.org;
|
||||
homepage = https://surf.suckless.org;
|
||||
license = licenses.mit;
|
||||
platforms = webkitgtk.meta.platforms;
|
||||
maintainers = with maintainers; [ joachifm ];
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
let
|
||||
stableVersion = "2.0.3";
|
||||
previewVersion = "2.1.0rc3";
|
||||
previewVersion = "2.1.0rc4";
|
||||
addVersion = args:
|
||||
let version = if args.stable then stableVersion else previewVersion;
|
||||
branch = if args.stable then "stable" else "preview";
|
||||
@ -16,7 +16,7 @@ in {
|
||||
};
|
||||
guiPreview = mkGui {
|
||||
stable = false;
|
||||
sha256Hash = "0yc5lr01xb7lk4dsrwx79mimbr91vldpvqbrx37j3kym6p5m84cn";
|
||||
sha256Hash = "10p8i45n6qsf431d0xpy5dk3g5qh6zdlnfj82jn9xdyccgxs4x3s";
|
||||
};
|
||||
|
||||
serverStable = mkServer {
|
||||
@ -25,6 +25,6 @@ in {
|
||||
};
|
||||
serverPreview = mkServer {
|
||||
stable = false;
|
||||
sha256Hash = "1lac88d9cmlhrwmlvxv1sk86600rwznw3lpsm440bax6qbdfcis3";
|
||||
sha256Hash = "1z8a3s90k86vmi4rwsd3v74gwvml68ci6f3zgxaji3z1sm22zcyd";
|
||||
};
|
||||
}
|
||||
|
@ -4,7 +4,23 @@
|
||||
|
||||
let
|
||||
pythonPackages = python3Packages;
|
||||
yarl = if (!stable) then pythonPackages.yarl
|
||||
# TODO: Not sure if all these overwrites are really required...
|
||||
# Upstream seems to have some reasons (bugs, incompatibilities) though.
|
||||
multidict_3_1_3 =
|
||||
(stdenv.lib.overrideDerivation pythonPackages.multidict (oldAttrs:
|
||||
rec {
|
||||
pname = "multidict";
|
||||
version = "3.1.3";
|
||||
name = "${pname}-${version}";
|
||||
src = pythonPackages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "04kdxh19m41c6vbshwk8jfbidsfsqn7mn0abvx09nyg78sh80pw7";
|
||||
};
|
||||
doInstallCheck = false;
|
||||
}));
|
||||
yarl = if (!stable)
|
||||
then (stdenv.lib.overrideDerivation pythonPackages.yarl (oldAttrs:
|
||||
{ propagatedBuildInputs = [ multidict_3_1_3 ]; }))
|
||||
else (stdenv.lib.overrideDerivation pythonPackages.yarl (oldAttrs:
|
||||
rec {
|
||||
pname = "yarl";
|
||||
@ -15,7 +31,19 @@ let
|
||||
sha256 = "1v2dsmr7bqp0yx51pwhbxyvzza8m2f88prsnbd926mi6ah38p0d7";
|
||||
};
|
||||
}));
|
||||
aiohttp = if (!stable) then pythonPackages.aiohttp
|
||||
aiohttp = if (!stable)
|
||||
then (stdenv.lib.overrideDerivation pythonPackages.aiohttp (oldAttrs:
|
||||
rec {
|
||||
pname = "aiohttp";
|
||||
version = "2.2.5";
|
||||
name = "${pname}-${version}";
|
||||
src = pythonPackages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1g6kzkf5in0briyscwxsihgps833dq2ggcq6lfh1hq95ck8zsnxg";
|
||||
};
|
||||
propagatedBuildInputs = [ yarl multidict_3_1_3 ]
|
||||
++ (with pythonPackages; [ async-timeout chardet ]);
|
||||
}))
|
||||
else (stdenv.lib.overrideDerivation pythonPackages.aiohttp (oldAttrs:
|
||||
rec {
|
||||
pname = "aiohttp";
|
||||
@ -28,7 +56,9 @@ let
|
||||
propagatedBuildInputs = [ yarl ]
|
||||
++ (with pythonPackages; [ async-timeout chardet multidict ]);
|
||||
}));
|
||||
aiohttp-cors = if (!stable) then pythonPackages.aiohttp-cors
|
||||
aiohttp-cors = if (!stable)
|
||||
then (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors (oldAttrs:
|
||||
{ propagatedBuildInputs = [ aiohttp ]; }))
|
||||
else (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors (oldAttrs:
|
||||
rec {
|
||||
pname = "aiohttp-cors";
|
||||
|
@ -2,25 +2,25 @@
|
||||
libtoxcore,
|
||||
libpthreadstubs, libXdmcp, libXScrnSaver,
|
||||
qtbase, qtsvg, qttools, qttranslations,
|
||||
ffmpeg, filter-audio, libsodium, libopus,
|
||||
ffmpeg, filter-audio, libexif, libsodium, libopus,
|
||||
libvpx, openal, opencv, pcre, qrencode, sqlcipher }:
|
||||
|
||||
mkDerivation rec {
|
||||
name = "qtox-${version}";
|
||||
version = "1.11.0";
|
||||
version = "1.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tux3";
|
||||
owner = "qTox";
|
||||
repo = "qTox";
|
||||
rev = "v${version}";
|
||||
sha256 = "0h8v359h1xn2xm6xa9q56mjiw58ap1bpiwx1dxxmphjildxadwck";
|
||||
sha256 = "1832ay0167qjc2vvpps507mnb0531y3d3pxmlm5nakvcwjs7vl8d";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
libtoxcore
|
||||
libpthreadstubs libXdmcp libXScrnSaver
|
||||
qtbase qtsvg qttools qttranslations
|
||||
ffmpeg filter-audio libopus libsodium
|
||||
ffmpeg filter-audio libexif libopus libsodium
|
||||
libvpx openal opencv pcre qrencode sqlcipher
|
||||
];
|
||||
|
||||
@ -37,6 +37,7 @@ mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Qt Tox client";
|
||||
homepage = https://tox.chat;
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ viric jgeerds akaWolf peterhoeg ];
|
||||
platforms = platforms.all;
|
||||
|
@ -25,9 +25,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
cmakeFlags = [
|
||||
"-DENABLE_UPDATER=OFF"
|
||||
];
|
||||
] ++ stdenv.lib.optional (!doCheck) "-DENABLE_TESTS=OFF";
|
||||
|
||||
doCheck = false;
|
||||
doCheck = true;
|
||||
|
||||
checkTarget = "test";
|
||||
|
||||
|
@ -22,10 +22,6 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ boost libtorrentRasterbar qtbase qttools ]
|
||||
++ optional guiSupport dbus_libs;
|
||||
|
||||
preConfigure = ''
|
||||
export QT_QMAKE=$(dirname "$QMAKE")
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-boost-libdir=${boost.out}/lib"
|
||||
"--with-boost=${boost.dev}"
|
||||
|
@ -1,14 +1,14 @@
|
||||
{ stdenv, lib, fetchFromGitHub, go, procps, removeReferencesTo }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.14.39";
|
||||
version = "0.14.40";
|
||||
name = "syncthing-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "syncthing";
|
||||
repo = "syncthing";
|
||||
rev = "v${version}";
|
||||
sha256 = "0bq2vdfnl77qldg1zvfhdbmhsj80qz8pds4slqlwjmmjmk19sqnh";
|
||||
sha256 = "0fd4k09sb91d1bjqj2v1fh7raq98fdw45aaa58kramwhidsf9sy5";
|
||||
};
|
||||
|
||||
buildInputs = [ go removeReferencesTo ];
|
||||
|
@ -1,19 +1,19 @@
|
||||
{ lib, python3Packages, fetchFromGitHub, gtk3, cairo
|
||||
, aspellDicts, buildEnv
|
||||
, gnome3, hicolor_icon_theme
|
||||
, gnome3, hicolor_icon_theme, librsvg
|
||||
, xvfb_run, dbus, libnotify
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
name = "paperwork-${version}";
|
||||
# Don't forget to also update paperwork-backend when updating this!
|
||||
version = "1.2";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "paperwork";
|
||||
owner = "jflesch";
|
||||
owner = "openpaperwork";
|
||||
rev = version;
|
||||
sha256 = "1cb9wnhhpm3dyxjrkyl9bbva56xx85vlwlb7z07m1icflcln14x5";
|
||||
sha256 = "0lqnq74hdjj778j2k0syibwy4i37l8w932gmibs8617s4yi34rxz";
|
||||
};
|
||||
|
||||
# Patch out a few paths that assume that we're using the FHS:
|
||||
@ -47,7 +47,9 @@ python3Packages.buildPythonApplication rec {
|
||||
}}/lib/aspell";
|
||||
|
||||
checkInputs = [ xvfb_run dbus.daemon ];
|
||||
buildInputs = [ gnome3.defaultIconTheme hicolor_icon_theme libnotify ];
|
||||
buildInputs = [
|
||||
gnome3.defaultIconTheme hicolor_icon_theme libnotify librsvg
|
||||
];
|
||||
|
||||
# A few parts of chkdeps need to have a display and a dbus session, so we not
|
||||
# only need to run a virtual X server + dbus but also have a large enough
|
||||
@ -64,6 +66,7 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\""
|
||||
"--set GDK_PIXBUF_MODULE_FILE \"$GDK_PIXBUF_MODULE_FILE\""
|
||||
"--prefix XDG_DATA_DIRS : \"$out/share\""
|
||||
"--suffix XDG_DATA_DIRS : \"$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\""
|
||||
];
|
||||
|
@ -1,19 +1,21 @@
|
||||
{ stdenv, fetchurl, zlib }:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "glucose-${version}";
|
||||
version = "4.0";
|
||||
version = "4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.labri.fr/perso/lsimon/downloads/softwares/glucose-syrup.tgz";
|
||||
sha256 = "0bq5l2jabhdfhng002qfk0mcj4pfi1v5853x3c7igwfrgx0jmfld";
|
||||
url = "http://www.labri.fr/perso/lsimon/downloads/softwares/glucose-syrup-${version}.tgz";
|
||||
sha256 = "0aahrkaq7n0z986fpqz66yz946nxardfi6dh8calzcfjpvqiraji";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib ];
|
||||
|
||||
sourceRoot = "glucose-syrup/simp";
|
||||
sourceRoot = "glucose-syrup-${version}/simp";
|
||||
makeFlags = [ "r" ];
|
||||
installPhase = ''
|
||||
install -Dm0755 glucose_release $out/bin/glucose
|
||||
mkdir -p "$out/share/doc/${name}/"
|
||||
install -Dm0755 ../{LICEN?E,README*,Changelog*} "$out/share/doc/${name}/"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
@ -1,19 +1,18 @@
|
||||
{ stdenv, fetchurl, zlib }:
|
||||
{ stdenv, fetchurl, zlib, glucose }:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "glucose-syrup-${version}";
|
||||
version = "4.0";
|
||||
version = glucose.version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.labri.fr/perso/lsimon/downloads/softwares/glucose-syrup.tgz";
|
||||
sha256 = "0bq5l2jabhdfhng002qfk0mcj4pfi1v5853x3c7igwfrgx0jmfld";
|
||||
};
|
||||
src = glucose.src;
|
||||
|
||||
buildInputs = [ zlib ];
|
||||
|
||||
sourceRoot = "glucose-syrup/parallel";
|
||||
sourceRoot = "glucose-syrup-${version}/parallel";
|
||||
makeFlags = [ "r" ];
|
||||
installPhase = ''
|
||||
install -Dm0755 glucose-syrup_release $out/bin/glucose-syrup
|
||||
mkdir -p "$out/share/doc/${name}/"
|
||||
install -Dm0755 ../{LICEN?E,README*,Changelog*} "$out/share/doc/${name}/"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
@ -94,6 +94,14 @@ in stdenv.mkDerivation {
|
||||
postPatch = ''
|
||||
sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \
|
||||
src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp
|
||||
patch -p0 < ${
|
||||
fetchurl { # for glibc-2.26
|
||||
name = "conflicting-types-for-greg_t.patch";
|
||||
url = "http://www.linuxquestions.org/questions/"
|
||||
+ "attachment.php?attachmentid=25801&d=1504099531";
|
||||
sha256 = "1bcyf9qrqxizyjp1s662k6n1cfyfjbl7256r4n20kbr65yxcydps";
|
||||
}
|
||||
}
|
||||
'';
|
||||
|
||||
# first line: ugly hack, and it isn't yet clear why it's a problem
|
||||
|
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "sway-${version}";
|
||||
version = "0.14.0";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Sircmpwn";
|
||||
owner = "swaywm";
|
||||
repo = "sway";
|
||||
rev = "${version}";
|
||||
sha256 = "1l8v9cdzd44bm4q71d47vqg6933b8j42q1a61r362vz2la1rcpq2";
|
||||
rev = version;
|
||||
sha256 = "0rz5rgap2ah7hkk4glvlmjq0c8i2f47qzkwjx7gm4wmb8gymikmh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -97,6 +97,11 @@ stdenv.mkDerivation {
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
passthru = {
|
||||
# "cc" is the generic name for a C compiler, but there is no one for package
|
||||
# providing the linker and related tools. The two we use now are GNU
|
||||
# Binutils, and Apple's "cctools"; "binutils" as an attempt to find an
|
||||
# unused middle-ground name that evokes both.
|
||||
bintools = binutils_bin;
|
||||
inherit libc nativeTools nativeLibc nativePrefix isGNU isClang default_cxx_stdlib_compile
|
||||
prefix;
|
||||
|
||||
|
@ -1,34 +1,6 @@
|
||||
{ fetchFromGitHub
|
||||
, stdenv
|
||||
, pkgconfig
|
||||
, libarchive
|
||||
, glib
|
||||
, # Override this to use a different revision
|
||||
src-spec ?
|
||||
{ owner = "commercialhaskell";
|
||||
repo = "all-cabal-hashes";
|
||||
rev = "5e87c40f2cd96bd5dd953758e82f302107c7895e";
|
||||
sha256 = "12rw5fld64s0a2zjsdijfs0dv6vc6z7gcf24h4m2dmymzms4namg";
|
||||
}
|
||||
, lib
|
||||
}:
|
||||
{ fetchurl }:
|
||||
|
||||
# Use builtins.fetchTarball "https://github.com/commercialhaskell/all-cabal-hashes/archive/hackage.tar.gz"
|
||||
# instead if you want the latest Hackage automatically at the price of frequent re-downloads.
|
||||
let partition-all-cabal-hashes = stdenv.mkDerivation
|
||||
{ name = "partition-all-cabal-hashes";
|
||||
src = ./partition-all-cabal-hashes.c;
|
||||
unpackPhase = "true";
|
||||
buildInputs = [ libarchive glib ];
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildPhase =
|
||||
"cc -O3 $(pkg-config --cflags --libs libarchive glib-2.0) $src -o partition-all-cabal-hashes";
|
||||
installPhase =
|
||||
''
|
||||
mkdir -p $out/bin
|
||||
install -m755 partition-all-cabal-hashes $out/bin
|
||||
'';
|
||||
};
|
||||
in fetchFromGitHub (src-spec //
|
||||
{ postFetch = "${partition-all-cabal-hashes}/bin/partition-all-cabal-hashes $downloadedFile $out";
|
||||
})
|
||||
fetchurl {
|
||||
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/5e87c40f2cd96bd5dd953758e82f302107c7895e.tar.gz";
|
||||
sha256 = "0hjkddda9mdm21nb9bkhr9n5r9jllisif1qmzha91a9cps5w1mx5";
|
||||
}
|
||||
|
@ -1,190 +0,0 @@
|
||||
#include <stdio.h>
|
||||
#include <ctype.h>
|
||||
#include <glib.h>
|
||||
#include <string.h>
|
||||
#include <locale.h>
|
||||
#include <archive.h>
|
||||
#include <archive_entry.h>
|
||||
|
||||
static char * case_normalize(char * str) {
|
||||
for (char * iter = str; *iter; ++iter) {
|
||||
*iter = tolower(*iter);
|
||||
}
|
||||
return str;
|
||||
}
|
||||
|
||||
static gint compare_str(const void * a, const void * b, void * _) {
|
||||
return strcmp(a, b);
|
||||
}
|
||||
|
||||
int main(int argc, char ** argv) {
|
||||
if (argc != 3) {
|
||||
fprintf(stderr, "Usage: %s TARBALL OUTPUT\n", argv[0]);
|
||||
return 1;
|
||||
}
|
||||
|
||||
size_t output_len = strlen(argv[2]);
|
||||
|
||||
/* Switch to standard locale to ensure consistency in case-folding.
|
||||
*/
|
||||
setlocale(LC_CTYPE, "C");
|
||||
|
||||
/* Map from case-normalized package name to a sorted sequence of
|
||||
* package names in the equivalence class defined by
|
||||
* case-normalization.
|
||||
*/
|
||||
GHashTable * equivalence_classes =
|
||||
g_hash_table_new(g_str_hash, g_str_equal);
|
||||
|
||||
/* Open up the tarball.
|
||||
*/
|
||||
struct archive * ar = archive_read_new();
|
||||
if (!ar) {
|
||||
perror("Allocating archive structure");
|
||||
return 1;
|
||||
}
|
||||
archive_read_support_filter_gzip(ar);
|
||||
archive_read_support_format_tar(ar);
|
||||
if (archive_read_open_filename( ar
|
||||
, argv[1]
|
||||
, 10240
|
||||
) == ARCHIVE_FATAL) {
|
||||
fprintf( stderr
|
||||
, "Error opening %s: %s\n"
|
||||
, argv[0]
|
||||
, archive_error_string(ar)
|
||||
);
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Extract the length of the output directory that prefixes all
|
||||
* tarball entries from the first entry in the tarball.
|
||||
*/
|
||||
struct archive_entry * ent;
|
||||
int err = archive_read_next_header(ar, &ent);
|
||||
if (err != ARCHIVE_OK) {
|
||||
if (err == ARCHIVE_EOF) {
|
||||
fprintf( stderr
|
||||
, "No entries in %s, surely this is an error!\n"
|
||||
, argv[1]
|
||||
);
|
||||
} else {
|
||||
fprintf( stderr
|
||||
, "Error reading entry from %s: %s\n"
|
||||
, argv[1]
|
||||
, archive_error_string(ar)
|
||||
);
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
const char * path = archive_entry_pathname(ent);
|
||||
/* Number of characters from the start of the path name until after
|
||||
* the slash after the leading directory.
|
||||
*/
|
||||
size_t prefix_len = strchr(path, '/') - path + 1;
|
||||
|
||||
/* Extract each entry to the right partition.
|
||||
*/
|
||||
do {
|
||||
path = archive_entry_pathname(ent) + prefix_len;
|
||||
const char * pkg_end = strchr(path, '/');
|
||||
if (!pkg_end)
|
||||
/* If there is no second slash, then this is either just the entry
|
||||
* corresponding to the root or some non-package file (e.g.
|
||||
* travis.yml). In either case, we don't care.
|
||||
*/
|
||||
continue;
|
||||
|
||||
/* Find our package in the equivalence class map.
|
||||
*/
|
||||
char * pkg_name = g_strndup(path, pkg_end - path);
|
||||
char * pkg_normalized =
|
||||
case_normalize(g_strndup(path, pkg_end - path));
|
||||
GSequence * pkg_class =
|
||||
g_hash_table_lookup(equivalence_classes, pkg_normalized);
|
||||
gint partition_num;
|
||||
if (!pkg_class) {
|
||||
/* We haven't seen any packages with this normalized name yet,
|
||||
* so we need to initialize the sequence and add it to the map.
|
||||
*/
|
||||
pkg_class = g_sequence_new(NULL);
|
||||
g_sequence_append(pkg_class, pkg_name);
|
||||
g_hash_table_insert( equivalence_classes
|
||||
, pkg_normalized
|
||||
, pkg_class
|
||||
);
|
||||
partition_num = 1;
|
||||
} else {
|
||||
g_free(pkg_normalized);
|
||||
/* Find the package name in the equivalence class */
|
||||
GSequenceIter * pkg_iter =
|
||||
g_sequence_search( pkg_class
|
||||
, pkg_name
|
||||
, compare_str
|
||||
, NULL
|
||||
);
|
||||
if (!g_sequence_iter_is_end(pkg_iter)) {
|
||||
/* If there are any packages after this one in the list, bail
|
||||
* out. In principle we could solve this by moving them up to
|
||||
* the next partition, but so far I've never seen any github
|
||||
* tarballs out of order so let's save ourselves the work
|
||||
* until we know we need it.
|
||||
*/
|
||||
fprintf( stderr
|
||||
, "Out of order github tarball: %s is after %s\n"
|
||||
, pkg_name
|
||||
, (char *) g_sequence_get(pkg_iter)
|
||||
);
|
||||
return 1;
|
||||
}
|
||||
pkg_iter = g_sequence_iter_prev(pkg_iter);
|
||||
if (strcmp( g_sequence_get(pkg_iter)
|
||||
, pkg_name
|
||||
) != 0) {
|
||||
/* This package doesn't have the same name as the one right
|
||||
* before where it should be in the sequence, which means it's
|
||||
* new and needs to be added to the sequence.
|
||||
*
|
||||
* !!! We need to change this to use g_sequence_insert_before
|
||||
* if we ever get an out-of-order github tarball, see comment
|
||||
* after the check for !g_sequence_iter_is_end(pkg_iter).
|
||||
*/
|
||||
pkg_iter = g_sequence_append(pkg_class, pkg_name);
|
||||
} else {
|
||||
g_free(pkg_name);
|
||||
}
|
||||
/* Get the partition number, starting with 1.
|
||||
*/
|
||||
partition_num = g_sequence_iter_get_position(pkg_iter) + 1;
|
||||
}
|
||||
|
||||
/* Set the destination path.
|
||||
* The 3 below is for the length of /#/, the partition number part
|
||||
* of the path. If we have more than 9 partitions, we deserve to
|
||||
* segfault. The 1 at the end is for the trailing null.
|
||||
*/
|
||||
char * dest_path = g_malloc(output_len + 3 + strlen(path) + 1);
|
||||
sprintf(dest_path, "%s/%d/%s", argv[2], partition_num, path);
|
||||
archive_entry_set_pathname(ent, dest_path);
|
||||
|
||||
if (archive_read_extract(ar, ent, 0) != ARCHIVE_OK) {
|
||||
fprintf( stderr
|
||||
, "Error extracting entry %s from %s: %s\n"
|
||||
, dest_path
|
||||
, argv[1]
|
||||
, archive_error_string(ar)
|
||||
);
|
||||
return 1;
|
||||
}
|
||||
} while ((err = archive_read_next_header(ar, &ent)) == ARCHIVE_OK);
|
||||
if (err != ARCHIVE_EOF) {
|
||||
fprintf( stderr
|
||||
, "Error reading entry from %s: %s\n"
|
||||
, argv[1]
|
||||
, archive_error_string(ar)
|
||||
);
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
@ -1 +1 @@
|
||||
WGET_ARGS=( https://download.kde.org/stable/plasma/5.11.2/ -A '*.tar.xz' )
|
||||
WGET_ARGS=( https://download.kde.org/stable/plasma/5.11.3/ -A '*.tar.xz' )
|
||||
|
@ -8,7 +8,7 @@ index 7e2d9758..40a5797b 100644
|
||||
import org.kde.kcoreaddons 1.0 as KCoreAddons
|
||||
-import "logic.js" as Logic
|
||||
+import "../code/logic.js" as Logic
|
||||
|
||||
|
||||
Item {
|
||||
id: batteryItem
|
||||
diff --git a/applets/batterymonitor/package/contents/ui/batterymonitor.qml b/applets/batterymonitor/package/contents/ui/batterymonitor.qml
|
||||
@ -21,7 +21,7 @@ index ae6d5919..c2f99c86 100644
|
||||
import org.kde.kquickcontrolsaddons 2.0
|
||||
-import "logic.js" as Logic
|
||||
+import "../code/logic.js" as Logic
|
||||
|
||||
|
||||
Item {
|
||||
id: batterymonitor
|
||||
diff --git a/applets/lock_logout/contents/ui/lockout.qml b/applets/lock_logout/contents/ui/lockout.qml
|
||||
@ -34,7 +34,7 @@ index 80e7e53b..0083cf01 100644
|
||||
import org.kde.kquickcontrolsaddons 2.0
|
||||
-import "data.js" as Data
|
||||
+import "../code/data.js" as Data
|
||||
|
||||
|
||||
Flow {
|
||||
id: lockout
|
||||
diff --git a/applets/notifications/package/contents/ui/main.qml b/applets/notifications/package/contents/ui/main.qml
|
||||
@ -42,12 +42,12 @@ index acdda88f..989de8ab 100644
|
||||
--- a/applets/notifications/package/contents/ui/main.qml
|
||||
+++ b/applets/notifications/package/contents/ui/main.qml
|
||||
@@ -28,7 +28,7 @@ import org.kde.plasma.extras 2.0 as PlasmaExtras
|
||||
|
||||
|
||||
import org.kde.plasma.private.notifications 1.0
|
||||
|
||||
|
||||
-import "uiproperties.js" as UiProperties
|
||||
+import "../code/uiproperties.js" as UiProperties
|
||||
|
||||
|
||||
MouseEventListener {
|
||||
id: notificationsApplet
|
||||
diff --git a/krunner/dbus/org.kde.krunner.service.in b/krunner/dbus/org.kde.krunner.service.in
|
||||
@ -59,7 +59,7 @@ index 85715214..294eab08 100644
|
||||
Name=org.kde.krunner
|
||||
-Exec=@CMAKE_INSTALL_PREFIX@/bin/krunner
|
||||
+Exec=@CMAKE_INSTALL_FULL_BINDIR@/krunner
|
||||
|
||||
|
||||
diff --git a/kuiserver/org.kde.kuiserver.service.in b/kuiserver/org.kde.kuiserver.service.in
|
||||
index 7a86d07f..5b3030cc 100644
|
||||
--- a/kuiserver/org.kde.kuiserver.service.in
|
||||
@ -76,7 +76,7 @@ index fe29f57a..247db953 100644
|
||||
@@ -3,11 +3,6 @@ add_subdirectory(kstartupconfig)
|
||||
add_subdirectory(ksyncdbusenv)
|
||||
add_subdirectory(waitforname)
|
||||
|
||||
|
||||
-#FIXME: reconsider, looks fishy
|
||||
-if(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr")
|
||||
- set(EXPORT_XCURSOR_PATH "XCURSOR_PATH=${CMAKE_INSTALL_PREFIX}/share/icons:$XCURSOR_PATH\":~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons\"; export XCURSOR_PATH")
|
||||
@ -106,7 +106,7 @@ index e9fa0bee..79e50a96 100644
|
||||
-# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ )
|
||||
+# NIXPKGS KDE STARTUP SCRIPT ( @PROJECT_VERSION@ )
|
||||
#
|
||||
|
||||
|
||||
+if test "x$1" = x--failsafe; then
|
||||
+ KDE_FAILSAFE=1 # General failsafe flag
|
||||
+ KWIN_COMPOSE=N # Disable KWin's compositing
|
||||
@ -117,7 +117,7 @@ index e9fa0bee..79e50a96 100644
|
||||
# When the X server dies we get a HUP signal from xinit. We must ignore it
|
||||
# because we still need to do some cleanup.
|
||||
trap 'echo GOT SIGHUP' HUP
|
||||
|
||||
|
||||
-# Check if a Plasma session already is running and whether it's possible to connect to X
|
||||
-kcheckrunning
|
||||
+# we have to unset this for Darwin since it will screw up KDE's dynamic-loading
|
||||
@ -140,12 +140,12 @@ index e9fa0bee..79e50a96 100644
|
||||
+ echo "\$DISPLAY is not set or cannot connect to the X server."
|
||||
+ exit 1
|
||||
fi
|
||||
|
||||
|
||||
# Boot sequence:
|
||||
@@ -33,59 +42,132 @@ fi
|
||||
#
|
||||
# * Then ksmserver is started which takes control of the rest of the startup sequence
|
||||
|
||||
|
||||
-# We need to create config folder so we can write startupconfigkeys
|
||||
-if [ ${XDG_CONFIG_HOME} ]; then
|
||||
- configDir=$XDG_CONFIG_HOME;
|
||||
@ -174,7 +174,7 @@ index e9fa0bee..79e50a96 100644
|
||||
+if [ -e $XDG_CONFIG_HOME/Trolltech.conf ]; then
|
||||
+ @NIXPKGS_SED@ -e '/nix\\store\|nix\/store/ d' -i $XDG_CONFIG_HOME/Trolltech.conf
|
||||
fi
|
||||
|
||||
|
||||
-mkdir -p $configDir
|
||||
+@NIXPKGS_KBUILDSYCOCA5@
|
||||
+
|
||||
@ -227,7 +227,7 @@ index e9fa0bee..79e50a96 100644
|
||||
+cursorSize=0
|
||||
+EOF
|
||||
+fi
|
||||
|
||||
|
||||
#This is basically setting defaults so we can use them with kstartupconfig5
|
||||
-cat >$configDir/startupconfigkeys <<EOF
|
||||
+cat >"$XDG_CONFIG_HOME/startupconfigkeys" <<EOF
|
||||
@ -240,7 +240,7 @@ index e9fa0bee..79e50a96 100644
|
||||
kcmfonts General forceFontDPI 0
|
||||
+kcmfonts General dontChangeAASettings true
|
||||
EOF
|
||||
|
||||
|
||||
# preload the user's locale on first start
|
||||
-plasmalocalerc=$configDir/plasma-localerc
|
||||
-test -f $plasmalocalerc || {
|
||||
@ -253,7 +253,7 @@ index e9fa0bee..79e50a96 100644
|
||||
EOF
|
||||
-}
|
||||
+fi
|
||||
|
||||
|
||||
# export LC_* variables set by kcmshell5 formats into environment
|
||||
# so it can be picked up by QLocale and friends.
|
||||
-exportformatssettings=$configDir/plasma-locale-settings.sh
|
||||
@ -264,7 +264,7 @@ index e9fa0bee..79e50a96 100644
|
||||
+if [ -r "$exportformatssettings" ]; then
|
||||
+ . "$exportformatssettings"
|
||||
+fi
|
||||
|
||||
|
||||
# Write a default kdeglobals file to set up the font
|
||||
-kdeglobalsfile=$configDir/kdeglobals
|
||||
-test -f $kdeglobalsfile || {
|
||||
@ -287,7 +287,7 @@ index e9fa0bee..79e50a96 100644
|
||||
EOF
|
||||
-}
|
||||
+fi
|
||||
|
||||
|
||||
-kstartupconfig5
|
||||
-returncode=$?
|
||||
-if test $returncode -ne 0; then
|
||||
@ -300,13 +300,13 @@ index e9fa0bee..79e50a96 100644
|
||||
+if [ -r "$XDG_CONFIG_HOME/startupconfig" ]; then
|
||||
+ . "$XDG_CONFIG_HOME/startupconfig"
|
||||
+fi
|
||||
|
||||
|
||||
if [ "$kdeglobals_kscreen_screenscalefactors" ]; then
|
||||
export QT_SCREEN_SCALE_FACTORS="$kdeglobals_kscreen_screenscalefactors"
|
||||
@@ -94,26 +176,33 @@ fi
|
||||
#otherwise apps that manually opt in for high DPI get auto scaled by the developer AND manually scaled by us
|
||||
export QT_AUTO_SCREEN_SCALE_FACTOR=0
|
||||
|
||||
|
||||
+#Set the QtQuickControls style to our own: for QtQuickControls1
|
||||
+#it will fall back to Desktop, while it will use our own org.kde.desktop
|
||||
+#for QtQuickControlsStyle and Kirigami
|
||||
@ -342,7 +342,7 @@ index e9fa0bee..79e50a96 100644
|
||||
+ export XCURSOR_SIZE="$kcminputrc_mouse_cursorsize"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
-if test "$kcmfonts_general_forcefontdpi" -ne 0; then
|
||||
- xrdb -quiet -merge -nocpp <<EOF
|
||||
+if [ "${kcmfonts_general_forcefontdpi:-0}" -ne 0 ]; then
|
||||
@ -352,7 +352,7 @@ index e9fa0bee..79e50a96 100644
|
||||
fi
|
||||
@@ -122,11 +211,11 @@ dl=$DESKTOP_LOCKED
|
||||
unset DESKTOP_LOCKED # Don't want it in the environment
|
||||
|
||||
|
||||
ksplash_pid=
|
||||
-if test -z "$dl"; then
|
||||
+if [ -z "$dl" ]; then
|
||||
@ -367,7 +367,7 @@ index e9fa0bee..79e50a96 100644
|
||||
@@ -135,71 +224,6 @@ if test -z "$dl"; then
|
||||
esac
|
||||
fi
|
||||
|
||||
|
||||
-# Source scripts found in <config locations>/plasma-workspace/env/*.sh
|
||||
-# (where <config locations> correspond to the system and user's configuration
|
||||
-# directories, as identified by Qt's qtpaths, e.g. $HOME/.config
|
||||
@ -451,9 +451,9 @@ index e9fa0bee..79e50a96 100644
|
||||
- export GS_LIB
|
||||
-fi
|
||||
+@NIXPKGS_XSETROOT@ -cursor_name left_ptr
|
||||
|
||||
|
||||
echo 'startkde: Starting up...' 1>&2
|
||||
|
||||
|
||||
-# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all.
|
||||
-# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend
|
||||
-# to set it to a list of paths *not* including the KDE prefix if it's not /usr or
|
||||
@ -472,19 +472,19 @@ index e9fa0bee..79e50a96 100644
|
||||
export KDE_FULL_SESSION
|
||||
-xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
|
||||
+@NIXPKGS_XPROP@ -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
|
||||
|
||||
|
||||
KDE_SESSION_VERSION=5
|
||||
export KDE_SESSION_VERSION
|
||||
-xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
|
||||
+@NIXPKGS_XPROP@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
|
||||
|
||||
|
||||
-KDE_SESSION_UID=`id -ru`
|
||||
+KDE_SESSION_UID=$(@NIXPKGS_ID@ -ru)
|
||||
export KDE_SESSION_UID
|
||||
|
||||
|
||||
XDG_CURRENT_DESKTOP=KDE
|
||||
export XDG_CURRENT_DESKTOP
|
||||
|
||||
|
||||
+# Enforce xcb QPA. Helps switching between Wayland and X sessions.
|
||||
+export QT_QPA_PLATFORM=xcb
|
||||
+
|
||||
@ -527,7 +527,7 @@ index e9fa0bee..79e50a96 100644
|
||||
- xmessage -geometry 500x100 "Could not sync environment to dbus."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
# We set LD_BIND_NOW to increase the efficiency of kdeinit.
|
||||
# kdeinit unsets this variable before loading applications.
|
||||
-LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup
|
||||
@ -539,10 +539,10 @@ index e9fa0bee..79e50a96 100644
|
||||
- xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
-qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
|
||||
+@NIXPKGS_QDBUS@ org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
|
||||
|
||||
|
||||
# finally, give the session control to the session manager
|
||||
# see kdebase/ksmserver for the description of the rest of the startup sequence
|
||||
@@ -303,34 +330,37 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
|
||||
@ -568,12 +568,12 @@ index e9fa0bee..79e50a96 100644
|
||||
test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
|
||||
- xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
|
||||
fi
|
||||
|
||||
|
||||
#Anything after here is logout/shutdown
|
||||
|
||||
|
||||
-wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
|
||||
+wait_drkonqi=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true)
|
||||
|
||||
|
||||
-if test x"$wait_drkonqi"x = x"true"x ; then
|
||||
+if [ x"$wait_drkonqi"x = x"true"x ]; then
|
||||
# wait for remaining drkonqi instances with timeout (in seconds)
|
||||
@ -595,18 +595,18 @@ index e9fa0bee..79e50a96 100644
|
||||
break
|
||||
fi
|
||||
@@ -339,15 +369,17 @@ fi
|
||||
|
||||
|
||||
echo 'startkde: Shutting down...' 1>&2
|
||||
# just in case
|
||||
-test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
|
||||
+if [ -n "$ksplash_pid" ]; then
|
||||
+ kill "$ksplash_pid" 2>/dev/null
|
||||
+fi
|
||||
|
||||
|
||||
# Clean up
|
||||
-kdeinit5_shutdown
|
||||
+@NIXPKGS_KDEINIT5_SHUTDOWN@
|
||||
|
||||
|
||||
unset KDE_FULL_SESSION
|
||||
-xprop -root -remove KDE_FULL_SESSION
|
||||
+@NIXPKGS_XPROP@ -root -remove KDE_FULL_SESSION
|
||||
@ -614,24 +614,24 @@ index e9fa0bee..79e50a96 100644
|
||||
-xprop -root -remove KDE_SESSION_VERSION
|
||||
+@NIXPKGS_XPROP@ -root -remove KDE_SESSION_VERSION
|
||||
unset KDE_SESSION_UID
|
||||
|
||||
|
||||
echo 'startkde: Done.' 1>&2
|
||||
diff --git a/startkde/startplasma.cmake b/startkde/startplasma.cmake
|
||||
index fd232bdf..e1c8fff6 100644
|
||||
--- a/startkde/startplasma.cmake
|
||||
+++ b/startkde/startplasma.cmake
|
||||
@@ -1,6 +1,6 @@
|
||||
@@ -1,4 +1,4 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
-# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ )
|
||||
+# NIXPKGS Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ )
|
||||
#
|
||||
|
||||
|
||||
# Boot sequence:
|
||||
@@ -17,17 +17,13 @@
|
||||
#
|
||||
# * Then ksmserver is started which takes control of the rest of the startup sequence
|
||||
|
||||
|
||||
-# We need to create config folder so we can write startupconfigkeys
|
||||
-if [ ${XDG_CONFIG_HOME} ]; then
|
||||
- configDir=$XDG_CONFIG_HOME;
|
||||
@ -641,7 +641,7 @@ index fd232bdf..e1c8fff6 100644
|
||||
+if [ -r "$XDG_CONFIG_HOME/startupconfig" ]; then
|
||||
+ . "$XDG_CONFIG_HOME/startupconfig"
|
||||
fi
|
||||
|
||||
|
||||
-[ -r $configDir/startupconfig ] && . $configDir/startupconfig
|
||||
-
|
||||
-if test "$kcmfonts_general_forcefontdpi" -ne 0; then
|
||||
@ -653,7 +653,7 @@ index fd232bdf..e1c8fff6 100644
|
||||
fi
|
||||
@@ -36,11 +32,11 @@ dl=$DESKTOP_LOCKED
|
||||
unset DESKTOP_LOCKED # Don't want it in the environment
|
||||
|
||||
|
||||
ksplash_pid=
|
||||
-if test -z "$dl"; then
|
||||
+if [ -z "$dl" ]; then
|
||||
@ -668,7 +668,7 @@ index fd232bdf..e1c8fff6 100644
|
||||
@@ -52,48 +48,6 @@ fi
|
||||
#In wayland we want Plasma to use Qt's scaling
|
||||
export PLASMA_USE_QT_SCALING=1
|
||||
|
||||
|
||||
-# Activate the kde font directories.
|
||||
-#
|
||||
-# There are 4 directories that may be used for supplying fonts for KDE.
|
||||
@ -729,15 +729,15 @@ index fd232bdf..e1c8fff6 100644
|
||||
- export GS_LIB
|
||||
-fi
|
||||
+@NIXPKGS_XSETROOT@ -cursor_name left_ptr
|
||||
|
||||
|
||||
echo 'startplasma: Starting up...' 1>&2
|
||||
|
||||
|
||||
# export our session variables to the Xwayland server
|
||||
-xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
|
||||
-xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
|
||||
+@NIXPKGS_XPROP@ -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
|
||||
+@NIXPKGS_XPROP@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
|
||||
|
||||
|
||||
# We set LD_BIND_NOW to increase the efficiency of kdeinit.
|
||||
# kdeinit unsets this variable before loading applications.
|
||||
-LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup
|
||||
@ -749,10 +749,10 @@ index fd232bdf..e1c8fff6 100644
|
||||
- xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
-qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit
|
||||
+@NIXPKGS_QDBUS@ org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit
|
||||
|
||||
|
||||
# finally, give the session control to the session manager
|
||||
# see kdebase/ksmserver for the description of the rest of the startup sequence
|
||||
@@ -145,27 +89,26 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit
|
||||
@ -767,10 +767,10 @@ index fd232bdf..e1c8fff6 100644
|
||||
test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
|
||||
- xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
|
||||
fi
|
||||
|
||||
|
||||
-wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
|
||||
+wait_drkonqi=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true)
|
||||
|
||||
|
||||
-if test x"$wait_drkonqi"x = x"true"x ; then
|
||||
+if [ x"$wait_drkonqi"x = x"true"x ]; then
|
||||
# wait for remaining drkonqi instances with timeout (in seconds)
|
||||
@ -792,18 +792,18 @@ index fd232bdf..e1c8fff6 100644
|
||||
break
|
||||
fi
|
||||
@@ -174,15 +117,17 @@ fi
|
||||
|
||||
|
||||
echo 'startplasma: Shutting down...' 1>&2
|
||||
# just in case
|
||||
-test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
|
||||
+if [ -n "$ksplash_pid" ]; then
|
||||
+ kill "$ksplash_pid" 2>/dev/null
|
||||
+fi
|
||||
|
||||
|
||||
# Clean up
|
||||
-kdeinit5_shutdown
|
||||
+@NIXPKGS_KDEINIT5_SHUTDOWN@
|
||||
|
||||
|
||||
unset KDE_FULL_SESSION
|
||||
-xprop -root -remove KDE_FULL_SESSION
|
||||
+@NIXPKGS_XPROP@ -root -remove KDE_FULL_SESSION
|
||||
@ -811,7 +811,7 @@ index fd232bdf..e1c8fff6 100644
|
||||
-xprop -root -remove KDE_SESSION_VERSION
|
||||
+@NIXPKGS_XPROP@ -root -remove KDE_SESSION_VERSION
|
||||
unset KDE_SESSION_UID
|
||||
|
||||
|
||||
echo 'startplasma: Done.' 1>&2
|
||||
diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake
|
||||
index 417a87d4..3f62745a 100644
|
||||
@ -823,7 +823,7 @@ index 417a87d4..3f62745a 100644
|
||||
-# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ )
|
||||
+# NIXPKGS Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ )
|
||||
#
|
||||
|
||||
|
||||
-# in case we have been started with full pathname spec without being in PATH
|
||||
-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
|
||||
-if [ -n "$bindir" ]; then
|
||||
@ -861,7 +861,7 @@ index 417a87d4..3f62745a 100644
|
||||
+if [ -e $XDG_CONFIG_HOME/Trolltech.conf ]; then
|
||||
+ @NIXPKGS_SED@ -e '/nix\\store\|nix\/store/ d' -i $XDG_CONFIG_HOME/Trolltech.conf
|
||||
fi
|
||||
|
||||
|
||||
-# We need to create config folder so we can write startupconfigkeys
|
||||
-if [ ${XDG_CONFIG_HOME} ]; then
|
||||
- configDir=$XDG_CONFIG_HOME;
|
||||
@ -891,7 +891,7 @@ index 417a87d4..3f62745a 100644
|
||||
+gtk-button-images=1
|
||||
+EOF
|
||||
fi
|
||||
|
||||
|
||||
-mkdir -p $configDir
|
||||
+# Set the default GTK 3 theme
|
||||
+gtk3_settings="$XDG_CONFIG_HOME/gtk-3.0/settings.ini"
|
||||
@ -919,7 +919,7 @@ index 417a87d4..3f62745a 100644
|
||||
+cursorSize=0
|
||||
+EOF
|
||||
+fi
|
||||
|
||||
|
||||
#This is basically setting defaults so we can use them with kstartupconfig5
|
||||
-cat >$configDir/startupconfigkeys <<EOF
|
||||
+cat >"$XDG_CONFIG_HOME/startupconfigkeys" <<EOF
|
||||
@ -933,7 +933,7 @@ index 417a87d4..3f62745a 100644
|
||||
+kcmfonts General forceFontDPI 0
|
||||
+kcmfonts General dontChangeAASettings true
|
||||
EOF
|
||||
|
||||
|
||||
# preload the user's locale on first start
|
||||
-plasmalocalerc=$configDir/plasma-localerc
|
||||
-test -f $plasmalocalerc || {
|
||||
@ -946,7 +946,7 @@ index 417a87d4..3f62745a 100644
|
||||
EOF
|
||||
-}
|
||||
+fi
|
||||
|
||||
|
||||
# export LC_* variables set by kcmshell5 formats into environment
|
||||
# so it can be picked up by QLocale and friends.
|
||||
-exportformatssettings=$configDir/plasma-locale-settings.sh
|
||||
@ -957,7 +957,7 @@ index 417a87d4..3f62745a 100644
|
||||
+if [ -r "$exportformatssettings" ]; then
|
||||
+ . "$exportformatssettings"
|
||||
+fi
|
||||
|
||||
|
||||
# Write a default kdeglobals file to set up the font
|
||||
-kdeglobalsfile=$configDir/kdeglobals
|
||||
-test -f $kdeglobalsfile || {
|
||||
@ -1011,7 +1011,7 @@ index 417a87d4..3f62745a 100644
|
||||
- test -h $oxygenDir || ln -s $prefixDir $oxygenDir && fc-cache $oxygenDir
|
||||
- }
|
||||
fi
|
||||
|
||||
|
||||
-kstartupconfig5
|
||||
-returncode=$?
|
||||
-if test $returncode -ne 0; then
|
||||
@ -1022,11 +1022,11 @@ index 417a87d4..3f62745a 100644
|
||||
+if [ -r "$XDG_CONFIG_HOME/startupconfig" ]; then
|
||||
+ . "$XDG_CONFIG_HOME/startupconfig"
|
||||
+fi
|
||||
|
||||
|
||||
#Manually disable auto scaling because we are scaling above
|
||||
#otherwise apps that manually opt in for high DPI get auto scaled by the developer AND scaled by the wl_output
|
||||
export QT_AUTO_SCREEN_SCALE_FACTOR=0
|
||||
|
||||
|
||||
+XCURSOR_PATH=~/.icons
|
||||
+IFS=":" read -r -a xdgDirs <<< "$XDG_DATA_DIRS"
|
||||
+for xdgDir in "${xdgDirs[@]}"; do
|
||||
@ -1060,14 +1060,14 @@ index 417a87d4..3f62745a 100644
|
||||
+ export XCURSOR_SIZE="$kcminputrc_mouse_cursorsize"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
-if test "$kcmfonts_general_forcefontdpiwayland" -ne 0; then
|
||||
+if [ "${kcmfonts_general_forcefontdpiwayland:-0}" -ne 0 ]; then
|
||||
export QT_WAYLAND_FORCE_DPI=$kcmfonts_general_forcefontdpiwayland
|
||||
else
|
||||
export QT_WAYLAND_FORCE_DPI=96
|
||||
fi
|
||||
|
||||
|
||||
-# Source scripts found in <config locations>/plasma-workspace/env/*.sh
|
||||
-# (where <config locations> correspond to the system and user's configuration
|
||||
-# directories, as identified by Qt's qtpaths, e.g. $HOME/.config
|
||||
@ -1093,7 +1093,7 @@ index 417a87d4..3f62745a 100644
|
||||
-done
|
||||
-
|
||||
echo 'startplasmacompositor: Starting up...' 1>&2
|
||||
|
||||
|
||||
-# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all.
|
||||
-# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend
|
||||
-# to set it to a list of paths *not* including the KDE prefix if it's not /usr or
|
||||
@ -1114,16 +1114,16 @@ index 417a87d4..3f62745a 100644
|
||||
@@ -202,7 +200,7 @@ export KDE_FULL_SESSION
|
||||
KDE_SESSION_VERSION=5
|
||||
export KDE_SESSION_VERSION
|
||||
|
||||
|
||||
-KDE_SESSION_UID=`id -ru`
|
||||
+KDE_SESSION_UID=$(@NIXPKGS_ID@ -ru)
|
||||
export KDE_SESSION_UID
|
||||
|
||||
|
||||
XDG_CURRENT_DESKTOP=KDE
|
||||
@@ -212,26 +210,47 @@ export XDG_CURRENT_DESKTOP
|
||||
QT_QPA_PLATFORM=wayland
|
||||
export QT_QPA_PLATFORM
|
||||
|
||||
|
||||
+# Source scripts found in <config locations>/plasma-workspace/env/*.sh
|
||||
+# (where <config locations> correspond to the system and user's configuration
|
||||
+# directories, as identified by Qt's qtpaths, e.g. $HOME/.config
|
||||
@ -1165,12 +1165,12 @@ index 417a87d4..3f62745a 100644
|
||||
+ echo 'startplasmacompositor: Could not sync environment to dbus.' 1>&2
|
||||
+ exit 1
|
||||
fi
|
||||
|
||||
|
||||
-@KWIN_WAYLAND_BIN_PATH@ --xwayland --libinput --exit-with-session=@CMAKE_INSTALL_FULL_LIBEXECDIR@/startplasma
|
||||
+@KWIN_WAYLAND_BIN_PATH@ --xwayland --libinput --exit-with-session=@NIXPKGS_STARTPLASMA@
|
||||
|
||||
|
||||
echo 'startplasmacompositor: Shutting down...' 1>&2
|
||||
|
||||
|
||||
unset KDE_FULL_SESSION
|
||||
-xprop -root -remove KDE_FULL_SESSION
|
||||
+@NIXPKGS_XPROP@ -root -remove KDE_FULL_SESSION
|
||||
@ -1178,7 +1178,7 @@ index 417a87d4..3f62745a 100644
|
||||
-xprop -root -remove KDE_SESSION_VERSION
|
||||
+@NIXPKGS_XPROP@ -root -remove KDE_SESSION_VERSION
|
||||
unset KDE_SESSION_UID
|
||||
|
||||
|
||||
echo 'startplasmacompositor: Done.' 1>&2
|
||||
diff --git a/startkde/waitforname/org.kde.plasma.Notifications.service.in b/startkde/waitforname/org.kde.plasma.Notifications.service.in
|
||||
index 0a51b84b..f48b5d8a 100644
|
||||
|
@ -3,355 +3,355 @@
|
||||
|
||||
{
|
||||
bluedevil = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/bluedevil-5.11.2.tar.xz";
|
||||
sha256 = "0gwvmy8zn3wcdvcgc5j84gy1y7cxysy7bvnppg34rh6l5qc7vvjq";
|
||||
name = "bluedevil-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/bluedevil-5.11.3.tar.xz";
|
||||
sha256 = "1sgnj3z4s1k7h2ddvcq9r67qc8gbd4yv7zb9a24gi3x3iwd5hsf3";
|
||||
name = "bluedevil-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
breeze = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/breeze-5.11.2.tar.xz";
|
||||
sha256 = "1wv5dp657gw4vyiv9zf6r8qbs67sp5g0x0kf1vmr1bp0gkw0ai81";
|
||||
name = "breeze-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/breeze-5.11.3.tar.xz";
|
||||
sha256 = "1xlh8m9fw3009gdi0v1nn945rm1zg908apv8v9lgkgks6s2sspxk";
|
||||
name = "breeze-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
breeze-grub = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/breeze-grub-5.11.2.tar.xz";
|
||||
sha256 = "04m74iy0rijccmvqd7c9n4p6nk3flmb3zaf5qk8hv31qscg5qjaj";
|
||||
name = "breeze-grub-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/breeze-grub-5.11.3.tar.xz";
|
||||
sha256 = "1v1ha0j9kh4vcxknnwk78lzigvpqdrcj4gv6h86pxmwsipr5l2bl";
|
||||
name = "breeze-grub-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
breeze-gtk = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/breeze-gtk-5.11.2.tar.xz";
|
||||
sha256 = "0c3vshnkgp6c38rwr1x34hn244r78qkc7fj0ax2cibydv3l852d4";
|
||||
name = "breeze-gtk-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/breeze-gtk-5.11.3.tar.xz";
|
||||
sha256 = "1f9xlmc6mhr25mji8ir46qslnfa0i7q7pqkzp1hm5ss3kzdd45gb";
|
||||
name = "breeze-gtk-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
breeze-plymouth = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/breeze-plymouth-5.11.2.tar.xz";
|
||||
sha256 = "1v43z59y0zzwsrwa0y255i2q8krvr9yafdciyr63v4pb2564v4sd";
|
||||
name = "breeze-plymouth-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/breeze-plymouth-5.11.3.tar.xz";
|
||||
sha256 = "11m65cg74cfhglsppahnppisqp4rnj528b93k78pgvb4xazm7s76";
|
||||
name = "breeze-plymouth-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
discover = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/discover-5.11.2.tar.xz";
|
||||
sha256 = "0j31x26s446xvi6dxr83v15xbr6ysifiwvdzil8yfsynifhjk5n3";
|
||||
name = "discover-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/discover-5.11.3.tar.xz";
|
||||
sha256 = "1bavw2hynmznd72wmh4cmy6zs4a13gxcsh6gznd99g6shry8svix";
|
||||
name = "discover-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
drkonqi = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/drkonqi-5.11.2.tar.xz";
|
||||
sha256 = "1mgcp8zk4md0cyx6z6zz9s64jx9yshlnmsf1jxzhqwg8lyhyb77b";
|
||||
name = "drkonqi-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/drkonqi-5.11.3.tar.xz";
|
||||
sha256 = "1683h4nzk9kgwzwjzkr0bmk8vmq07991x4239z3p39z4gnvsmb0h";
|
||||
name = "drkonqi-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kactivitymanagerd = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/kactivitymanagerd-5.11.2.tar.xz";
|
||||
sha256 = "165nybhn7pwgr6fds6frwcp3qsnxpmkz3842h0ni0flkkcl74n52";
|
||||
name = "kactivitymanagerd-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/kactivitymanagerd-5.11.3.tar.xz";
|
||||
sha256 = "1syprfgbcg1821v0mqnalnn3gr40sfvi3m9wcy1hbffqm2k561qq";
|
||||
name = "kactivitymanagerd-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kde-cli-tools = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/kde-cli-tools-5.11.2.tar.xz";
|
||||
sha256 = "18pl9v2dxayzwzk4rw674ka3j45dj864604hgg0874kkr3kgsgka";
|
||||
name = "kde-cli-tools-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/kde-cli-tools-5.11.3.tar.xz";
|
||||
sha256 = "0yhghfsyvx0xlmyigjm8hvp8d4s6pp8h6wbqrbfngslayq624cvi";
|
||||
name = "kde-cli-tools-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kdecoration = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/kdecoration-5.11.2.tar.xz";
|
||||
sha256 = "0qkh3p1zzvk0yvlpbvwfgmb2wvj0gd3j2sbz10vplf66fm3ck2va";
|
||||
name = "kdecoration-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/kdecoration-5.11.3.tar.xz";
|
||||
sha256 = "0ik62pavf9bw1mahiyqlc9qh2za31l4qa3fyz42y81phmr8hbj4a";
|
||||
name = "kdecoration-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kde-gtk-config = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/kde-gtk-config-5.11.2.tar.xz";
|
||||
sha256 = "0vhmpma2ssp7nqdy8yd12d42y2a2fnsyyz9msi4s7n1w5qga0g5p";
|
||||
name = "kde-gtk-config-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/kde-gtk-config-5.11.3.tar.xz";
|
||||
sha256 = "09k02ghsrc5bwk05a7jlyzgwr6a1mzwypy6q1yhkl8jcqaim18ff";
|
||||
name = "kde-gtk-config-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kdeplasma-addons = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/kdeplasma-addons-5.11.2.tar.xz";
|
||||
sha256 = "0x1lgvcnrc9vcy9fqvc60ilmcm8pbym76fq784qmgnmzm0br3bq6";
|
||||
name = "kdeplasma-addons-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/kdeplasma-addons-5.11.3.tar.xz";
|
||||
sha256 = "13vmr5m3gx2b757bnb74qjjr6faj2bn1qb9cngj0gnk9gbdgrwh1";
|
||||
name = "kdeplasma-addons-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kgamma5 = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/kgamma5-5.11.2.tar.xz";
|
||||
sha256 = "0k6j6nl26bhdavfr4y0ph17fywprzxjnamh67vibk39xg6vwa56d";
|
||||
name = "kgamma5-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/kgamma5-5.11.3.tar.xz";
|
||||
sha256 = "18g8rj4l1y1lwl2wrk4cdlpdn6gibbwbipdkmlk0hb4ad1bxkc96";
|
||||
name = "kgamma5-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
khotkeys = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/khotkeys-5.11.2.tar.xz";
|
||||
sha256 = "1w1a06v2cgq48z0b1rz6px1g14hm7f5jxzxf7sa26yszsyhwqglm";
|
||||
name = "khotkeys-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/khotkeys-5.11.3.tar.xz";
|
||||
sha256 = "1bykjywj6yass35xv858azv9pw74wlqsss6hs9ra4sx0yh0n9ffp";
|
||||
name = "khotkeys-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kinfocenter = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/kinfocenter-5.11.2.tar.xz";
|
||||
sha256 = "1131gnqapnin8i4bm3skzhfsqgcaynaxn9xgfwxnj64z41cc8z8l";
|
||||
name = "kinfocenter-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/kinfocenter-5.11.3.tar.xz";
|
||||
sha256 = "1ip6zkrl81v987z7bj0mvkjmydyarxgih4gzkbgnpppl7746bs5n";
|
||||
name = "kinfocenter-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kmenuedit = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/kmenuedit-5.11.2.tar.xz";
|
||||
sha256 = "03412s6wc9h2422lx57rg65zln9ywjk5gbs5mqjr6fi46a1zp5lg";
|
||||
name = "kmenuedit-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/kmenuedit-5.11.3.tar.xz";
|
||||
sha256 = "1nks0lk1xnywx5r3bzr5npzapg5d25l73ygxq8988q1f4q39jlj6";
|
||||
name = "kmenuedit-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kscreen = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/kscreen-5.11.2.tar.xz";
|
||||
sha256 = "0bs09zfq1cs1ajgvz4p7l5naa3g3vzp72v9q7qkncx8yqiffxlnc";
|
||||
name = "kscreen-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/kscreen-5.11.3.tar.xz";
|
||||
sha256 = "03wcrqvqcsw47x504ydk3dkqw6x9dc2n3skh7asznmpda8ryb6dp";
|
||||
name = "kscreen-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kscreenlocker = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/kscreenlocker-5.11.2.tar.xz";
|
||||
sha256 = "1k32nzhv9d4g5ijkx8bl22hp5j1g22frriwq14xjw47ga8vkqmxw";
|
||||
name = "kscreenlocker-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/kscreenlocker-5.11.3.tar.xz";
|
||||
sha256 = "0i0xcakzznxsk0zqa664xavp64wbqgqim57bkp01wl82s3aik82v";
|
||||
name = "kscreenlocker-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
ksshaskpass = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/ksshaskpass-5.11.2.tar.xz";
|
||||
sha256 = "1z3vm8kwyi9pf51bhpqf3phbjkbrqfj4iiqzzs0aqm0l5db5il0r";
|
||||
name = "ksshaskpass-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/ksshaskpass-5.11.3.tar.xz";
|
||||
sha256 = "1ij2xspd6clf8plqqgzx6zjq7c1sxrlf7ch9brnxprw29h5qfz34";
|
||||
name = "ksshaskpass-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
ksysguard = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/ksysguard-5.11.2.tar.xz";
|
||||
sha256 = "0vy2ivsn0cg70n1cxwa2385fwh350xngc1429zjfcs0jj8lcj21l";
|
||||
name = "ksysguard-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/ksysguard-5.11.3.tar.xz";
|
||||
sha256 = "17b5lddmas5n1726xa5r8v0v6gmw6bzpvhcljk2r4yrly6gy3pv9";
|
||||
name = "ksysguard-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kwallet-pam = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/kwallet-pam-5.11.2.tar.xz";
|
||||
sha256 = "1jr4zvf9c5npi9mcgil5byx4bwh6kaa205329p5z8i15n1zf250f";
|
||||
name = "kwallet-pam-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/kwallet-pam-5.11.3.tar.xz";
|
||||
sha256 = "04ps2p3hjvkca8miqmg0xwh3i5van0jld2hb1xp737hy1dfpi9h4";
|
||||
name = "kwallet-pam-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kwayland-integration = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/kwayland-integration-5.11.2.tar.xz";
|
||||
sha256 = "1dzlf9638d36h8z5a7rjbb0xl2wjqg04j37gn4jnjclm57bwlrjm";
|
||||
name = "kwayland-integration-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/kwayland-integration-5.11.3.tar.xz";
|
||||
sha256 = "0j5czhq5r8pxy7pw00by0v75kk4lbijn7mrdnydlca3jjrdcgz6f";
|
||||
name = "kwayland-integration-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kwin = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/kwin-5.11.2.tar.xz";
|
||||
sha256 = "1wvq4pll1adncj88qd7isc0ip7hx2c72ah0vvmvxmkwxa4r5a89b";
|
||||
name = "kwin-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/kwin-5.11.3.tar.xz";
|
||||
sha256 = "1xgx7xn27lzqdwla45scfcnyxva97j2y2m7hgj60cd1mz686pill";
|
||||
name = "kwin-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
kwrited = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/kwrited-5.11.2.tar.xz";
|
||||
sha256 = "17i33yvpvpj6q42c58adb99xs1yb7yfchs626vw5nmllv7r7496l";
|
||||
name = "kwrited-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/kwrited-5.11.3.tar.xz";
|
||||
sha256 = "0qm3x6ahnis1b98q9h53wdldsj7nqw35s1hcgfqzjqk7nnxzim5i";
|
||||
name = "kwrited-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
libkscreen = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/libkscreen-5.11.2.tar.xz";
|
||||
sha256 = "18bf7mzzri7fj8iw60wqbs6w46lin8lninpqpcs5fwz6m81lcxsg";
|
||||
name = "libkscreen-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/libkscreen-5.11.3.tar.xz";
|
||||
sha256 = "01wbl1kinsvxfw5lq0wrhsk0fmv8gvkhr7m0w4lq1827wx68lfzw";
|
||||
name = "libkscreen-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
libksysguard = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/libksysguard-5.11.2.tar.xz";
|
||||
sha256 = "12d0r4rilydbqdgkm256khvkb9m0hya3p27xqvv3hg77wgxzdl3f";
|
||||
name = "libksysguard-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/libksysguard-5.11.3.tar.xz";
|
||||
sha256 = "1jbcd2n1zd6ijybaffm5vs5b80130vii562s98xhinmifzsahzmy";
|
||||
name = "libksysguard-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
milou = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/milou-5.11.2.tar.xz";
|
||||
sha256 = "0kxf2q0pk7kyfirrspgpwlnj18v8q2770rrmrv0jcfsgv4jhl2gj";
|
||||
name = "milou-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/milou-5.11.3.tar.xz";
|
||||
sha256 = "02j6f4ip7hgb5qpq9812g1pnm8fjd83dc923gyfpzb4i0nf6j93g";
|
||||
name = "milou-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
oxygen = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/oxygen-5.11.2.tar.xz";
|
||||
sha256 = "18nkw02q7lzdhalmbwsb5i704szs19zc5a0z73smanf20cfq7a91";
|
||||
name = "oxygen-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/oxygen-5.11.3.tar.xz";
|
||||
sha256 = "0zg3qdnip1ad6980ga0lmxndbph3y4dw0qk73dd8022qw5f3ysyp";
|
||||
name = "oxygen-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-desktop = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/plasma-desktop-5.11.2.tar.xz";
|
||||
sha256 = "0dz57qywlircjjybxzb3mqxwaid86zdfwjgfwcb6fhm8rxhbhrzq";
|
||||
name = "plasma-desktop-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/plasma-desktop-5.11.3.tar.xz";
|
||||
sha256 = "1igmq8zj71wf34ap2g0iakpjfq08mlg6yf1ly06111ygsinbg55a";
|
||||
name = "plasma-desktop-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-integration = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/plasma-integration-5.11.2.tar.xz";
|
||||
sha256 = "15vjmmrlk9dw0if0z3xam171f8z3qkjcllj3zyc0zxdwi2zw6i2l";
|
||||
name = "plasma-integration-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/plasma-integration-5.11.3.tar.xz";
|
||||
sha256 = "0bqw5xp71yxciqzd3bmlgsd4mkjl4vcysd9s6bka5mxrlhkqxgx1";
|
||||
name = "plasma-integration-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-nm = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/plasma-nm-5.11.2.tar.xz";
|
||||
sha256 = "1h3ajq3fdv8fn0r51cpkhihacpjvpgzpfyg2m9aydh7ajygf0njq";
|
||||
name = "plasma-nm-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/plasma-nm-5.11.3.tar.xz";
|
||||
sha256 = "1zqlg5jm3pgiirr98j3fl1h6wbhf4f06qainpy42b5w42vhizspk";
|
||||
name = "plasma-nm-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-pa = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/plasma-pa-5.11.2.tar.xz";
|
||||
sha256 = "1ckk4ckhy5y3b6cm7gahwkqvf8bxndk0srij3ggqdasxzdc4fjn8";
|
||||
name = "plasma-pa-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/plasma-pa-5.11.3.tar.xz";
|
||||
sha256 = "07rwlqpmvbvdidhfhw8xk6lvarimd1mhm085vjk7g2wmzw5n69wl";
|
||||
name = "plasma-pa-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-sdk = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/plasma-sdk-5.11.2.tar.xz";
|
||||
sha256 = "10ayy3r36ysq3a79nlpqspfff0s28iq2xyp5767qpmzfrjby4bcx";
|
||||
name = "plasma-sdk-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/plasma-sdk-5.11.3.tar.xz";
|
||||
sha256 = "17h42223agz4vvbff13xd1p7xa5swnhcrmh1779mswl1rfznrkys";
|
||||
name = "plasma-sdk-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-tests = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/plasma-tests-5.11.2.tar.xz";
|
||||
sha256 = "06k1cmmbyp4rslhmj6b1ngq6pg0hv9hmc3yi135vjgppj5x523mm";
|
||||
name = "plasma-tests-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/plasma-tests-5.11.3.tar.xz";
|
||||
sha256 = "0ac2i66f3mywvkf7041sg3hsa97f69y5aibpk0fz41q9zi5jwzv3";
|
||||
name = "plasma-tests-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-vault = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/plasma-vault-5.11.2.tar.xz";
|
||||
sha256 = "1lxp40lmb03aicw9lz742i1lrigkki76yy7p5h9gnb4djzv5h0m6";
|
||||
name = "plasma-vault-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/plasma-vault-5.11.3.tar.xz";
|
||||
sha256 = "12y2331lpp7i3fl6nbm78n6qh7hd7vmrvc94jkzwx5pbql6nx2ia";
|
||||
name = "plasma-vault-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-workspace = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/plasma-workspace-5.11.2.tar.xz";
|
||||
sha256 = "12i7raf4qqinr3wd4kzz96pkng19c7mdjqz28m8jwb3c1gdlps2w";
|
||||
name = "plasma-workspace-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/plasma-workspace-5.11.3.tar.xz";
|
||||
sha256 = "0skn3mg90ghx3bmlj7snbhap9z2fq0hab0gfi4pv80ggyl5jf9sp";
|
||||
name = "plasma-workspace-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-workspace-wallpapers = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/plasma-workspace-wallpapers-5.11.2.tar.xz";
|
||||
sha256 = "01a4cz7d15mrb96yhfvck61vbqdnw208mgssrllrmcfdn7hwalv1";
|
||||
name = "plasma-workspace-wallpapers-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/plasma-workspace-wallpapers-5.11.3.tar.xz";
|
||||
sha256 = "1xbfghhb6bjlqs2fk3z8k3q0lfirqmyqyxym2w8k69im2fscg0rl";
|
||||
name = "plasma-workspace-wallpapers-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
plymouth-kcm = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/plymouth-kcm-5.11.2.tar.xz";
|
||||
sha256 = "1dig5msins4grby4lvrrby0adjci8yplq1nw52xq571qvvcixjf4";
|
||||
name = "plymouth-kcm-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/plymouth-kcm-5.11.3.tar.xz";
|
||||
sha256 = "1sbxwvi402lcnzxalgr85srh8vd4wy26gav7q23qbhd5axh26f06";
|
||||
name = "plymouth-kcm-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
polkit-kde-agent = {
|
||||
version = "1-5.11.2";
|
||||
version = "1-5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/polkit-kde-agent-1-5.11.2.tar.xz";
|
||||
sha256 = "0qbr8c3fn6yp6ixfcfg4190q2wdj1xlm6791nn23bynd0nrxmxb3";
|
||||
name = "polkit-kde-agent-1-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/polkit-kde-agent-1-5.11.3.tar.xz";
|
||||
sha256 = "088ch67syimxqlda0nczrrj1hb7ynsrwdcb0bq1pcndp57p71vzl";
|
||||
name = "polkit-kde-agent-1-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
powerdevil = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/powerdevil-5.11.2.tar.xz";
|
||||
sha256 = "10ah28rqdn8xhz578yhcnampbfq7vh89gm0jzjx9ryxiv6rch2cw";
|
||||
name = "powerdevil-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/powerdevil-5.11.3.tar.xz";
|
||||
sha256 = "1807x3vzq24vip7dnl87cd1hn368vqk7cbyhai492irf20j7hn82";
|
||||
name = "powerdevil-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
sddm-kcm = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/sddm-kcm-5.11.2.tar.xz";
|
||||
sha256 = "159qwvzk7g4ygg2sdb6k84vq0k1yadrgwzgq6sfbfhffim1w6dr1";
|
||||
name = "sddm-kcm-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/sddm-kcm-5.11.3.tar.xz";
|
||||
sha256 = "1c9dm8819yaynq6cbzcg0j77cz0cf2cwrz9cfmr4w65ypl937va5";
|
||||
name = "sddm-kcm-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
systemsettings = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/systemsettings-5.11.2.tar.xz";
|
||||
sha256 = "11gcrd1i28hifjysvnj97fcy619h660j4bgszj9lmr8w554j0cri";
|
||||
name = "systemsettings-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/systemsettings-5.11.3.tar.xz";
|
||||
sha256 = "1abza0qmdhfdlr2k53lc4ymr42ri1pfv0yyf9plxhra7f7f2ylf7";
|
||||
name = "systemsettings-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
user-manager = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/user-manager-5.11.2.tar.xz";
|
||||
sha256 = "1pyyhhi276s8503q65n25rqwcddcbzy6l2vl844dnmmpd1m0gi4r";
|
||||
name = "user-manager-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/user-manager-5.11.3.tar.xz";
|
||||
sha256 = "0d2i3ndq9vwr2m39i6qdn18bg4c19rqhfy2a38lhm30g288wxfbr";
|
||||
name = "user-manager-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
xdg-desktop-portal-kde = {
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.11.2/xdg-desktop-portal-kde-5.11.2.tar.xz";
|
||||
sha256 = "0yjidwqk25c7grj42facqfl84ai7h4fin0zlf8y9jdksv26hskl0";
|
||||
name = "xdg-desktop-portal-kde-5.11.2.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.11.3/xdg-desktop-portal-kde-5.11.3.tar.xz";
|
||||
sha256 = "01jcya7xyrn3d99raqvbzfwllihzdpyizx757f87pgg43dmbggwm";
|
||||
name = "xdg-desktop-portal-kde-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, noSysDirs
|
||||
{ stdenv, targetPackages, fetchurl, noSysDirs
|
||||
, langC ? true, langCC ? true, langFortran ? false
|
||||
, langJava ? false
|
||||
, langAda ? false
|
||||
@ -77,8 +77,8 @@ let version = "4.5.4";
|
||||
withCpu +
|
||||
withAbi +
|
||||
# Ensure that -print-prog-name is able to find the correct programs.
|
||||
" --with-as=${binutils}/bin/${targetPlatform.config}-as" +
|
||||
" --with-ld=${binutils}/bin/${targetPlatform.config}-ld" +
|
||||
" --with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as" +
|
||||
" --with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" +
|
||||
(if crossMingw && crossStageStatic then
|
||||
" --with-headers=${libcCross}/include" +
|
||||
" --with-gcc" +
|
||||
@ -229,7 +229,7 @@ stdenv.mkDerivation ({
|
||||
++ (optional langJava boehmgc)
|
||||
++ (optionals langJava [zip unzip])
|
||||
++ (optionals javaAwtGtk ([gtk2 pkgconfig libart_lgpl] ++ xlibs))
|
||||
++ (optionals (targetPlatform != hostPlatform) [binutils])
|
||||
++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
|
||||
++ (optionals langAda [gnatboot])
|
||||
++ (optionals langVhdl [gnat])
|
||||
;
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, fetchpatch, noSysDirs
|
||||
{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs
|
||||
, langC ? true, langCC ? true, langFortran ? false
|
||||
, langObjC ? targetPlatform.isDarwin
|
||||
, langObjCpp ? targetPlatform.isDarwin
|
||||
@ -153,8 +153,8 @@ let version = "4.8.5";
|
||||
withFloat +
|
||||
withMode +
|
||||
# Ensure that -print-prog-name is able to find the correct programs.
|
||||
" --with-as=${binutils}/bin/${targetPlatform.config}-as" +
|
||||
" --with-ld=${binutils}/bin/${targetPlatform.config}-ld" +
|
||||
" --with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as" +
|
||||
" --with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" +
|
||||
(if crossMingw && crossStageStatic then
|
||||
" --with-headers=${libcCross}/include" +
|
||||
" --with-gcc" +
|
||||
@ -303,7 +303,7 @@ stdenv.mkDerivation ({
|
||||
++ (optional (zlib != null) zlib)
|
||||
++ (optionals langJava [ boehmgc zip unzip ])
|
||||
++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
|
||||
++ (optionals (targetPlatform != hostPlatform) [binutils])
|
||||
++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
|
||||
++ (optionals langAda [gnatboot])
|
||||
++ (optionals langVhdl [gnat])
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, noSysDirs
|
||||
{ stdenv, targetPackages, fetchurl, noSysDirs
|
||||
, langC ? true, langCC ? true, langFortran ? false
|
||||
, langObjC ? targetPlatform.isDarwin
|
||||
, langObjCpp ? targetPlatform.isDarwin
|
||||
@ -144,8 +144,8 @@ let version = "4.9.4";
|
||||
withFloat +
|
||||
withMode +
|
||||
# Ensure that -print-prog-name is able to find the correct programs.
|
||||
" --with-as=${binutils}/bin/${targetPlatform.config}-as" +
|
||||
" --with-ld=${binutils}/bin/${targetPlatform.config}-ld" +
|
||||
" --with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as" +
|
||||
" --with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" +
|
||||
(if crossMingw && crossStageStatic then
|
||||
" --with-headers=${libcCross}/include" +
|
||||
" --with-gcc" +
|
||||
@ -296,7 +296,7 @@ stdenv.mkDerivation ({
|
||||
++ (optional (zlib != null) zlib)
|
||||
++ (optionals langJava [ boehmgc zip unzip ])
|
||||
++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
|
||||
++ (optionals (targetPlatform != hostPlatform) [binutils])
|
||||
++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
|
||||
++ (optionals langAda [gnatboot])
|
||||
++ (optionals langVhdl [gnat])
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, noSysDirs
|
||||
{ stdenv, targetPackages, fetchurl, noSysDirs
|
||||
, langC ? true, langCC ? true, langFortran ? false
|
||||
, langObjC ? targetPlatform.isDarwin
|
||||
, langObjCpp ? targetPlatform.isDarwin
|
||||
@ -31,7 +31,6 @@
|
||||
, libpthread ? null, libpthreadCross ? null # required for GNU/Hurd
|
||||
, stripped ? true
|
||||
, gnused ? null
|
||||
, binutils ? null
|
||||
, cloog # unused; just for compat with gcc4, as we override the parameter on some places
|
||||
, darwin ? null
|
||||
, buildPlatform, hostPlatform, targetPlatform
|
||||
@ -51,7 +50,7 @@ assert libelf != null -> zlib != null;
|
||||
assert hostPlatform.isDarwin -> gnused != null;
|
||||
|
||||
# Need c++filt on darwin
|
||||
assert hostPlatform.isDarwin -> binutils != null;
|
||||
assert hostPlatform.isDarwin -> targetPackages.stdenv.cc.bintools or null != null;
|
||||
|
||||
# The go frontend is written in c++
|
||||
assert langGo -> langCC;
|
||||
@ -149,8 +148,8 @@ let version = "5.5.0";
|
||||
withFloat +
|
||||
withMode +
|
||||
# Ensure that -print-prog-name is able to find the correct programs.
|
||||
" --with-as=${binutils}/bin/${targetPlatform.config}-as" +
|
||||
" --with-ld=${binutils}/bin/${targetPlatform.config}-ld" +
|
||||
" --with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as" +
|
||||
" --with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" +
|
||||
(if crossMingw && crossStageStatic then
|
||||
" --with-headers=${libcCross}/include" +
|
||||
" --with-gcc" +
|
||||
@ -312,7 +311,7 @@ stdenv.mkDerivation ({
|
||||
++ (optional (zlib != null) zlib)
|
||||
++ (optionals langJava [ boehmgc zip unzip ])
|
||||
++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
|
||||
++ (optionals (targetPlatform != hostPlatform) [binutils])
|
||||
++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
|
||||
++ (optionals (buildPlatform != hostPlatform) [buildPackages.stdenv.cc])
|
||||
++ (optionals langAda [gnatboot])
|
||||
++ (optionals langVhdl [gnat])
|
||||
@ -320,7 +319,7 @@ stdenv.mkDerivation ({
|
||||
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
|
||||
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
|
||||
++ (optional hostPlatform.isDarwin gnused)
|
||||
++ (optional hostPlatform.isDarwin binutils)
|
||||
++ (optional hostPlatform.isDarwin targetPackages.stdenv.cc.bintools)
|
||||
;
|
||||
|
||||
NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl";
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, noSysDirs
|
||||
{ stdenv, targetPackages, fetchurl, noSysDirs
|
||||
, langC ? true, langCC ? true, langFortran ? false
|
||||
, langObjC ? targetPlatform.isDarwin
|
||||
, langObjCpp ? targetPlatform.isDarwin
|
||||
@ -31,7 +31,6 @@
|
||||
, libpthread ? null, libpthreadCross ? null # required for GNU/Hurd
|
||||
, stripped ? true
|
||||
, gnused ? null
|
||||
, binutils ? null
|
||||
, cloog # unused; just for compat with gcc4, as we override the parameter on some places
|
||||
, darwin ? null
|
||||
, buildPlatform, hostPlatform, targetPlatform
|
||||
@ -50,7 +49,7 @@ assert libelf != null -> zlib != null;
|
||||
assert hostPlatform.isDarwin -> gnused != null;
|
||||
|
||||
# Need c++filt on darwin
|
||||
assert hostPlatform.isDarwin -> binutils != null;
|
||||
assert hostPlatform.isDarwin -> targetPackages.stdenv.cc.bintools or null != null;
|
||||
|
||||
# The go frontend is written in c++
|
||||
assert langGo -> langCC;
|
||||
@ -145,8 +144,8 @@ let version = "6.4.0";
|
||||
withFloat +
|
||||
withMode +
|
||||
# Ensure that -print-prog-name is able to find the correct programs.
|
||||
" --with-as=${binutils}/bin/${targetPlatform.config}-as" +
|
||||
" --with-ld=${binutils}/bin/${targetPlatform.config}-ld" +
|
||||
" --with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as" +
|
||||
" --with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" +
|
||||
(if crossMingw && crossStageStatic then
|
||||
" --with-headers=${libcCross}/include" +
|
||||
" --with-gcc" +
|
||||
@ -309,14 +308,14 @@ stdenv.mkDerivation ({
|
||||
++ (optional (zlib != null) zlib)
|
||||
++ (optionals langJava [ boehmgc zip unzip ])
|
||||
++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
|
||||
++ (optionals (targetPlatform != hostPlatform) [binutils])
|
||||
++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
|
||||
++ (optionals langAda [gnatboot])
|
||||
++ (optionals langVhdl [gnat])
|
||||
|
||||
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
|
||||
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
|
||||
++ (optional hostPlatform.isDarwin gnused)
|
||||
++ (optional hostPlatform.isDarwin binutils)
|
||||
++ (optional hostPlatform.isDarwin targetPackages.stdenv.cc.bintools)
|
||||
;
|
||||
|
||||
NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl";
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, noSysDirs
|
||||
{ stdenv, targetPackages, fetchurl, noSysDirs
|
||||
, langC ? true, langCC ? true, langFortran ? false
|
||||
, langObjC ? targetPlatform.isDarwin
|
||||
, langObjCpp ? targetPlatform.isDarwin
|
||||
@ -31,7 +31,6 @@
|
||||
, libpthread ? null, libpthreadCross ? null # required for GNU/Hurd
|
||||
, stripped ? true
|
||||
, gnused ? null
|
||||
, binutils ? null
|
||||
, cloog # unused; just for compat with gcc4, as we override the parameter on some places
|
||||
, darwin ? null
|
||||
, flex ? null
|
||||
@ -51,7 +50,7 @@ assert libelf != null -> zlib != null;
|
||||
assert hostPlatform.isDarwin -> gnused != null;
|
||||
|
||||
# Need c++filt on darwin
|
||||
assert hostPlatform.isDarwin -> binutils != null;
|
||||
assert hostPlatform.isDarwin -> targetPackages.stdenv.cc.bintools or null != null;
|
||||
|
||||
# The go frontend is written in c++
|
||||
assert langGo -> langCC;
|
||||
@ -144,8 +143,8 @@ let version = "7.2.0";
|
||||
withFloat +
|
||||
withMode +
|
||||
# Ensure that -print-prog-name is able to find the correct programs.
|
||||
" --with-as=${binutils}/bin/${targetPlatform.config}-as" +
|
||||
" --with-ld=${binutils}/bin/${targetPlatform.config}-ld" +
|
||||
" --with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as" +
|
||||
" --with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" +
|
||||
(if crossMingw && crossStageStatic then
|
||||
" --with-headers=${libcCross}/include" +
|
||||
" --with-gcc" +
|
||||
@ -308,14 +307,14 @@ stdenv.mkDerivation ({
|
||||
++ (optional (zlib != null) zlib)
|
||||
++ (optionals langJava [ boehmgc zip unzip ])
|
||||
++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
|
||||
++ (optionals (targetPlatform != hostPlatform) [binutils])
|
||||
++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
|
||||
++ (optionals langAda [gnatboot])
|
||||
++ (optionals langVhdl [gnat])
|
||||
|
||||
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
|
||||
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
|
||||
++ (optional hostPlatform.isDarwin gnused)
|
||||
++ (optional hostPlatform.isDarwin binutils)
|
||||
++ (optional hostPlatform.isDarwin targetPackages.stdenv.cc.bintools)
|
||||
;
|
||||
|
||||
NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl";
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, noSysDirs
|
||||
{ stdenv, targetPackages, fetchurl, noSysDirs
|
||||
, langC ? true, langCC ? true, langFortran ? false
|
||||
, langObjC ? targetPlatform.isDarwin
|
||||
, langObjCpp ? targetPlatform.isDarwin
|
||||
@ -31,7 +31,6 @@
|
||||
, libpthread ? null, libpthreadCross ? null # required for GNU/Hurd
|
||||
, stripped ? true
|
||||
, gnused ? null
|
||||
, binutils ? null
|
||||
, cloog # unused; just for compat with gcc4, as we override the parameter on some places
|
||||
, darwin ? null
|
||||
, flex ? null
|
||||
@ -51,7 +50,7 @@ assert libelf != null -> zlib != null;
|
||||
assert hostPlatform.isDarwin -> gnused != null;
|
||||
|
||||
# Need c++filt on darwin
|
||||
assert hostPlatform.isDarwin -> binutils != null;
|
||||
assert hostPlatform.isDarwin -> targetPackages.stdenv.cc.bintools or null != null;
|
||||
|
||||
# The go frontend is written in c++
|
||||
assert langGo -> langCC;
|
||||
@ -144,8 +143,8 @@ let version = "7-20170409";
|
||||
withFloat +
|
||||
withMode +
|
||||
# Ensure that -print-prog-name is able to find the correct programs.
|
||||
" --with-as=${binutils}/bin/${targetPlatform.config}-as" +
|
||||
" --with-ld=${binutils}/bin/${targetPlatform.config}-ld" +
|
||||
" --with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as" +
|
||||
" --with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" +
|
||||
(if crossMingw && crossStageStatic then
|
||||
" --with-headers=${libcCross}/include" +
|
||||
" --with-gcc" +
|
||||
@ -295,14 +294,14 @@ stdenv.mkDerivation ({
|
||||
++ (optional (zlib != null) zlib)
|
||||
++ (optionals langJava [ boehmgc zip unzip ])
|
||||
++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
|
||||
++ (optionals (targetPlatform != hostPlatform) [binutils])
|
||||
++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
|
||||
++ (optionals langAda [gnatboot])
|
||||
++ (optionals langVhdl [gnat])
|
||||
|
||||
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
|
||||
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
|
||||
++ (optional hostPlatform.isDarwin gnused)
|
||||
++ (optional hostPlatform.isDarwin binutils)
|
||||
++ (optional hostPlatform.isDarwin targetPackages.stdenv.cc.bintools)
|
||||
;
|
||||
|
||||
NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl";
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, ncurses, libiconv, binutils, coreutils
|
||||
{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, ncurses, libiconv, targetPackages, coreutils
|
||||
, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, hscolour
|
||||
|
||||
# If enabled GHC will be build with the GPL-free but slower integer-simple
|
||||
@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
|
||||
for i in "$out/bin/"*; do
|
||||
test ! -h $i || continue
|
||||
egrep --quiet '^#!' <(head -n 1 $i) || continue
|
||||
sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i
|
||||
sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
|
||||
done
|
||||
'';
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, ncurses, libiconv, binutils, coreutils
|
||||
{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, ncurses, libiconv, targetPackages, coreutils
|
||||
, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, hscolour
|
||||
|
||||
# If enabled GHC will be build with the GPL-free but slower integer-simple
|
||||
@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
|
||||
for i in "$out/bin/"*; do
|
||||
test ! -h $i || continue
|
||||
egrep --quiet '^#!' <(head -n 1 $i) || continue
|
||||
sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i
|
||||
sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
|
||||
done
|
||||
'';
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, ghc, perl, ncurses, binutils, libiconv
|
||||
{ stdenv, fetchurl, ghc, perl, ncurses, libiconv
|
||||
|
||||
# If enabled GHC will be build with the GPL-free but slower integer-simple
|
||||
# library instead of the faster but GPLed integer-gmp library.
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchurl, fetchpatch, bootPkgs, perl, ncurses, libiconv, binutils, coreutils
|
||||
{ stdenv, lib, fetchurl, fetchpatch, bootPkgs, perl, ncurses, libiconv, targetPackages, coreutils
|
||||
, hscolour, patchutils, sphinx
|
||||
|
||||
# If enabled GHC will be build with the GPL-free but slower integer-simple
|
||||
@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
|
||||
for i in "$out/bin/"*; do
|
||||
test ! -h $i || continue
|
||||
egrep --quiet '^#!' <(head -n 1 $i) || continue
|
||||
sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i
|
||||
sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
|
||||
done
|
||||
'';
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchurl, bootPkgs, perl, ncurses, libiconv, binutils, coreutils
|
||||
{ stdenv, lib, fetchurl, bootPkgs, perl, ncurses, libiconv, targetPackages, coreutils
|
||||
, autoconf, automake, happy, alex, python3, sphinx, hscolour
|
||||
, buildPlatform, targetPlatform , selfPkgs, cross ? null
|
||||
|
||||
@ -66,7 +66,7 @@ in stdenv.mkDerivation (rec {
|
||||
for i in "$out/bin/"*; do
|
||||
test ! -h $i || continue
|
||||
egrep --quiet '^#!' <(head -n 1 $i) || continue
|
||||
sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i
|
||||
sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
|
||||
done
|
||||
'';
|
||||
|
||||
@ -97,23 +97,23 @@ in stdenv.mkDerivation (rec {
|
||||
|
||||
configureFlags = [
|
||||
"CC=${stdenv.ccCross}/bin/${cross.config}-cc"
|
||||
"LD=${stdenv.binutils}/bin/${cross.config}-ld"
|
||||
"AR=${stdenv.binutils}/bin/${cross.config}-ar"
|
||||
"NM=${stdenv.binutils}/bin/${cross.config}-nm"
|
||||
"RANLIB=${stdenv.binutils}/bin/${cross.config}-ranlib"
|
||||
"LD=${targetPackages.stdenv.cc.bintools}/bin/${cross.config}-ld"
|
||||
"AR=${targetPackages.stdenv.cc.bintools}/bin/${cross.config}-ar"
|
||||
"NM=${targetPackages.stdenv.cc.bintools}/bin/${cross.config}-nm"
|
||||
"RANLIB=${targetPackages.stdenv.cc.bintools}/bin/${cross.config}-ranlib"
|
||||
"--target=${cross.config}"
|
||||
"--enable-bootstrap-with-devel-snapshot"
|
||||
] ++
|
||||
# fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
|
||||
lib.optional (cross.config or null == "aarch64-apple-darwin14") "--disable-large-address-space";
|
||||
|
||||
buildInputs = commonBuildInputs ++ [ stdenv.ccCross stdenv.binutils ];
|
||||
buildInputs = commonBuildInputs ++ [ stdenv.ccCross stdenv.targetPackages.stdenv.cc.bintools ];
|
||||
|
||||
dontSetConfigureCross = true;
|
||||
|
||||
passthru = {
|
||||
inherit bootPkgs cross;
|
||||
cc = "${stdenv.ccCross}/bin/${cross.config}-cc";
|
||||
ld = "${stdenv.binutils}/bin/${cross.config}-ld";
|
||||
ld = "${stdenv.targetPackages.stdenv.cc.bintools}/bin/${cross.config}-ld";
|
||||
};
|
||||
})
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchgit, bootPkgs, perl, ncurses, libiconv, binutils, coreutils
|
||||
{ stdenv, lib, fetchgit, bootPkgs, perl, ncurses, libiconv, targetPackages, coreutils
|
||||
, autoconf, automake, happy, alex, python3, buildPlatform, targetPlatform
|
||||
, selfPkgs, cross ? null
|
||||
|
||||
@ -71,7 +71,7 @@ in stdenv.mkDerivation (rec {
|
||||
for i in "$out/bin/"*; do
|
||||
test ! -h $i || continue
|
||||
egrep --quiet '^#!' <(head -n 1 $i) || continue
|
||||
sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i
|
||||
sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
|
||||
done
|
||||
'';
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchgit, bootPkgs, perl, gmp, ncurses, binutils, autoconf, alex, happy, makeStaticLibraries
|
||||
{ stdenv, fetchgit, bootPkgs, perl, gmp, ncurses, targetPackages, autoconf, alex, happy, makeStaticLibraries
|
||||
, hscolour, xen, automake, gcc, git, zlib, libtool, enableIntegerSimple ? false
|
||||
}:
|
||||
|
||||
@ -17,14 +17,14 @@ stdenv.mkDerivation rec {
|
||||
sed -i '305 d' Makefile
|
||||
sed -i '309,439 d' Makefile # Removes RPM packaging
|
||||
sed -i '20 d' src/scripts/halvm-cabal.in
|
||||
sed -ie 's|ld |${binutils}/bin/ld |g' src/scripts/ldkernel.in
|
||||
sed -ie 's|ld |${targetPackages.stdenv.cc.bintools}/bin/ld |g' src/scripts/ldkernel.in
|
||||
'';
|
||||
configureFlags = stdenv.lib.optional (!enableIntegerSimple) [ "--enable-gmp" ];
|
||||
propagatedNativeBuildInputs = [ alex happy ];
|
||||
buildInputs =
|
||||
let haskellPkgs = [ alex happy bootPkgs.hscolour bootPkgs.cabal-install bootPkgs.haddock bootPkgs.hpc
|
||||
]; in [ bootPkgs.ghc
|
||||
automake perl git binutils
|
||||
automake perl git targetPackages.stdenv.cc.bintools
|
||||
autoconf xen zlib ncurses.dev
|
||||
libtool gmp ] ++ haskellPkgs;
|
||||
preConfigure = ''
|
||||
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
||||
inherit bootPkgs;
|
||||
cross.config = "halvm";
|
||||
cc = "${gcc}/bin/gcc";
|
||||
ld = "${binutils}/bin/ld";
|
||||
ld = "${targetPackages.stdenv.cc.bintools}/bin/ld";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
@ -80,6 +80,9 @@ stdenv.mkDerivation rec {
|
||||
mv test/$i.jl{,.off}
|
||||
touch test/$i.jl
|
||||
done
|
||||
|
||||
sed -e 's/Invalid Content-Type:/invalid Content-Type:/g' -i test/libgit2.jl
|
||||
sed -e 's/Failed to resolve /failed to resolve /g' -i test/libgit2.jl
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
|
@ -20,7 +20,11 @@ stdenv.mkDerivation rec {
|
||||
'"${libcxxabi}/lib/libc++abi.dylib"'
|
||||
'';
|
||||
|
||||
patches = [ ./darwin.patch ];
|
||||
patches = [
|
||||
./darwin.patch
|
||||
# glibc 2.26 fix
|
||||
./xlocale-glibc-2.26.patch
|
||||
];
|
||||
|
||||
buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
|
||||
|
||||
|
@ -0,0 +1,17 @@
|
||||
diff --git a/include/__locale b/include/__locale
|
||||
index 3daa1f1..cb8e151 100644
|
||||
--- a/include/__locale
|
||||
+++ b/include/__locale
|
||||
@@ -29,10 +29,10 @@
|
||||
# if __ANDROID_API__ <= 20
|
||||
# include <support/android/locale_bionic.h>
|
||||
# endif
|
||||
-#elif (defined(__GLIBC__) || defined(__APPLE__) || defined(__FreeBSD__) \
|
||||
+#elif (defined(__APPLE__) || defined(__FreeBSD__) \
|
||||
|| defined(__sun__) || defined(__EMSCRIPTEN__) || defined(__IBMCPP__))
|
||||
# include <xlocale.h>
|
||||
-#endif // __GLIBC__ || __APPLE__ || __FreeBSD__ || __sun__ || __EMSCRIPTEN__ || __IBMCPP__
|
||||
+#endif // __APPLE__ || __FreeBSD__ || __sun__ || __EMSCRIPTEN__ || __IBMCPP__
|
||||
|
||||
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
|
||||
#pragma GCC system_header
|
@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
|
||||
patches = [
|
||||
./darwin.patch
|
||||
./r242056.patch
|
||||
# glibc 2.26 fix
|
||||
./xlocale-glibc-2.26.patch
|
||||
];
|
||||
|
||||
buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
|
||||
|
@ -0,0 +1,17 @@
|
||||
diff --git a/include/__locale b/include/__locale
|
||||
index 1989558..1e42905 100644
|
||||
--- a/include/__locale
|
||||
+++ b/include/__locale
|
||||
@@ -34,10 +34,10 @@
|
||||
# include <support/solaris/xlocale.h>
|
||||
#elif defined(_NEWLIB_VERSION)
|
||||
# include <support/newlib/xlocale.h>
|
||||
-#elif (defined(__GLIBC__) || defined(__APPLE__) || defined(__FreeBSD__) \
|
||||
+#elif (defined(__APPLE__) || defined(__FreeBSD__) \
|
||||
|| defined(__EMSCRIPTEN__) || defined(__IBMCPP__))
|
||||
# include <xlocale.h>
|
||||
-#endif // __GLIBC__ || __APPLE__ || __FreeBSD__ || __sun__ || __EMSCRIPTEN__ || __IBMCPP__
|
||||
+#endif // __APPLE__ || __FreeBSD__ || __sun__ || __EMSCRIPTEN__ || __IBMCPP__
|
||||
|
||||
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
|
||||
#pragma GCC system_header
|
@ -14,7 +14,10 @@ stdenv.mkDerivation rec {
|
||||
cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$NIX_BUILD_TOP/libcxxabi-${version}.src/include")
|
||||
'';
|
||||
|
||||
patches = lib.optional stdenv.isDarwin ./darwin.patch;
|
||||
patches = [
|
||||
# glibc 2.26 fix
|
||||
../../3.9/libc++/xlocale-glibc-2.26.patch
|
||||
] ++ lib.optional stdenv.isDarwin ./darwin.patch;
|
||||
|
||||
buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
|
||||
|
||||
|
@ -14,7 +14,10 @@ stdenv.mkDerivation rec {
|
||||
cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$NIX_BUILD_TOP/libcxxabi-${version}.src/include")
|
||||
'';
|
||||
|
||||
patches = lib.optional stdenv.isDarwin ./darwin.patch;
|
||||
patches = [
|
||||
# glibc 2.26 fix
|
||||
./xlocale-glibc-2.26.patch
|
||||
] ++ lib.optional stdenv.isDarwin ./darwin.patch;
|
||||
|
||||
buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
|
||||
|
||||
|
@ -0,0 +1,19 @@
|
||||
diff --git a/include/__locale b/include/__locale
|
||||
index 7bc701d..ea75c86 100644
|
||||
--- a/include/__locale
|
||||
+++ b/include/__locale
|
||||
@@ -34,12 +34,12 @@
|
||||
# include <support/solaris/xlocale.h>
|
||||
#elif defined(_NEWLIB_VERSION)
|
||||
# include <support/newlib/xlocale.h>
|
||||
-#elif (defined(__GLIBC__) || defined(__APPLE__) || defined(__FreeBSD__) \
|
||||
+#elif (defined(__APPLE__) || defined(__FreeBSD__) \
|
||||
|| defined(__EMSCRIPTEN__) || defined(__IBMCPP__))
|
||||
# include <xlocale.h>
|
||||
#elif defined(_LIBCPP_HAS_MUSL_LIBC)
|
||||
# include <support/musl/xlocale.h>
|
||||
-#endif // __GLIBC__ || __APPLE__ || __FreeBSD__ || __sun__ || __EMSCRIPTEN__ || __IBMCPP__
|
||||
+#endif // __APPLE__ || __FreeBSD__ || __sun__ || __EMSCRIPTEN__ || __IBMCPP__
|
||||
|
||||
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
|
||||
#pragma GCC system_header
|
@ -10,8 +10,12 @@ stdenv.mkDerivation rec {
|
||||
export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include"
|
||||
'';
|
||||
|
||||
# https://github.com/llvm-mirror/libcxx/commit/bcc92d75df0274b9593ebd097fcae60494e3bffc
|
||||
patches = [ ./pthread_mach_thread_np.patch ];
|
||||
patches = [
|
||||
# https://github.com/llvm-mirror/libcxx/commit/bcc92d75df0274b9593ebd097fcae60494e3bffc
|
||||
./pthread_mach_thread_np.patch
|
||||
# glibc 2.26 fix
|
||||
./xlocale-glibc-2.26.patch
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++"
|
||||
|
@ -0,0 +1,19 @@
|
||||
diff --git a/include/__locale b/include/__locale
|
||||
index f4882de..29443b4 100644
|
||||
--- a/include/__locale
|
||||
+++ b/include/__locale
|
||||
@@ -34,12 +34,12 @@
|
||||
# include <support/solaris/xlocale.h>
|
||||
#elif defined(_NEWLIB_VERSION)
|
||||
# include <support/newlib/xlocale.h>
|
||||
-#elif (defined(__GLIBC__) || defined(__APPLE__) || defined(__FreeBSD__) \
|
||||
+#elif (defined(__APPLE__) || defined(__FreeBSD__) \
|
||||
|| defined(__EMSCRIPTEN__) || defined(__IBMCPP__))
|
||||
# include <xlocale.h>
|
||||
#elif defined(_LIBCPP_HAS_MUSL_LIBC)
|
||||
# include <support/musl/xlocale.h>
|
||||
-#endif // __GLIBC__ || __APPLE__ || __FreeBSD__ || __sun__ || __EMSCRIPTEN__ || __IBMCPP__
|
||||
+#endif // __APPLE__ || __FreeBSD__ || __sun__ || __EMSCRIPTEN__ || __IBMCPP__
|
||||
|
||||
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
|
||||
#pragma GCC system_header
|
@ -30,6 +30,9 @@ stdenv.mkDerivation rec {
|
||||
+ "c6d9c6d796200990b3b6a53a4dc716c9192398e6.patch";
|
||||
sha256 = "1pq0qhhb9gbhc3zbgylwp0amhwsz0q0ggpj6v2xgv0hfy7d63rcd";
|
||||
})
|
||||
# Glibc 2.26 no longer has xlocale.h, patch backported from upstream commit
|
||||
# e286c8f3301fa443255a3101d14b7392467051b8.
|
||||
./xlocale-fix.patch
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
|
59
pkgs/development/compilers/neko/xlocale-fix.patch
Normal file
59
pkgs/development/compilers/neko/xlocale-fix.patch
Normal file
@ -0,0 +1,59 @@
|
||||
commit 31d3ac3d691b2a1b07991e67302fd52b0f409cac
|
||||
Author: Andy Li <andy@onthewings.net>
|
||||
Date: Thu Jul 13 13:23:33 2017 +0800
|
||||
|
||||
include xlocale.h only if it is available since it is removed in recent glibc
|
||||
|
||||
see: https://bugzilla.redhat.com/show_bug.cgi?id=1464244
|
||||
|
||||
(Backported from e286c8f3301fa443255a3101d14b7392467051b8)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 8de1702..d64cab9 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,5 +1,6 @@
|
||||
cmake_minimum_required(VERSION 2.8.7)
|
||||
|
||||
+include(CheckIncludeFile)
|
||||
project(neko C)
|
||||
|
||||
set(CMAKE_OSX_ARCHITECTURES x86_64)
|
||||
@@ -48,6 +49,8 @@ set(NEKO_VERSION_MAJOR 2)
|
||||
set(NEKO_VERSION_MINOR 1)
|
||||
set(NEKO_VERSION_PATCH 0)
|
||||
|
||||
+check_include_file(xlocale.h HAVE_XLOCALE_H)
|
||||
+
|
||||
configure_file (
|
||||
"${CMAKE_SOURCE_DIR}/vm/neko.h.in"
|
||||
"${CMAKE_BINARY_DIR}/neko.h"
|
||||
diff --git a/libs/std/sys.c b/libs/std/sys.c
|
||||
index 8003d41..ae0cfee 100644
|
||||
--- a/libs/std/sys.c
|
||||
+++ b/libs/std/sys.c
|
||||
@@ -41,7 +41,11 @@
|
||||
# include <sys/time.h>
|
||||
# include <sys/times.h>
|
||||
# include <sys/wait.h>
|
||||
+#ifdef HAVE_XLOCALE_H
|
||||
# include <xlocale.h>
|
||||
+#else
|
||||
+# include <locale.h>
|
||||
+#endif
|
||||
#endif
|
||||
|
||||
#ifdef NEKO_MAC
|
||||
diff --git a/vm/neko.h.in b/vm/neko.h.in
|
||||
index bb9ec1b..147ecce 100644
|
||||
--- a/vm/neko.h.in
|
||||
+++ b/vm/neko.h.in
|
||||
@@ -88,6 +88,8 @@
|
||||
# include <stdint.h>
|
||||
#endif
|
||||
|
||||
+#cmakedefine HAVE_XLOCALE_H
|
||||
+
|
||||
#define NEKO_VERSION_MAJOR @NEKO_VERSION_MAJOR@
|
||||
#define NEKO_VERSION_MINOR @NEKO_VERSION_MINOR@
|
||||
#define NEKO_VERSION_PATCH @NEKO_VERSION_PATCH@
|
@ -4,13 +4,13 @@ with lib;
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "psc-package";
|
||||
version = "0.2.0";
|
||||
version = "0.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "purescript";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0vid8vc8n8xj0qa4gnm1any9s18rdh7yn960vgix17r7a3bdndwb";
|
||||
sha256 = "0m1vcxa5zs4sqnnwgmxkhw1isdlmirp12yimn5345vwfvlxkc8kp";
|
||||
};
|
||||
|
||||
isLibrary = false;
|
||||
|
@ -1,5 +1,6 @@
|
||||
{ stdenv, fetchurl, fetchgit, fetchzip, file, python2, tzdata, procps
|
||||
, llvm, jemalloc, ncurses, darwin, binutils, rustPlatform, git, cmake, curl
|
||||
{ stdenv, targetPackages
|
||||
, fetchurl, fetchgit, fetchzip, file, python2, tzdata, procps
|
||||
, llvm, jemalloc, ncurses, darwin, rustPlatform, git, cmake, curl
|
||||
, which, libffi, gdb
|
||||
, version
|
||||
, forceBundledLLVM ? false
|
||||
@ -49,7 +50,7 @@ stdenv.mkDerivation {
|
||||
++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath" ]
|
||||
++ [ "--enable-vendor" "--disable-locked-deps" ]
|
||||
# ++ [ "--jemalloc-root=${jemalloc}/lib"
|
||||
++ [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${binutils.out}/bin/ar" ]
|
||||
++ [ "--default-linker=${targetPackages.stdenv.cc}/bin/cc" "--default-ar=${targetPackages.stdenv.cc.bintools}/bin/ar" ]
|
||||
++ optional (!forceBundledLLVM) [ "--enable-llvm-link-shared" ]
|
||||
++ optional (stdenv.cc.cc ? isClang) "--enable-clang"
|
||||
++ optional (targets != []) "--target=${target}"
|
||||
|
@ -1,4 +1,5 @@
|
||||
{ stdenv
|
||||
, targetPackages
|
||||
, cmake
|
||||
, coreutils
|
||||
, glibc
|
||||
@ -26,7 +27,6 @@
|
||||
, rsync
|
||||
, git
|
||||
, libgit2
|
||||
, binutils
|
||||
, fetchFromGitHub
|
||||
, paxctl
|
||||
, findutils
|
||||
@ -250,7 +250,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# TODO: Use wrappers to get these on the PATH for swift tools, instead
|
||||
ln -s ${clang}/bin/* $out/bin/
|
||||
ln -s ${binutils}/bin/ar $out/bin/ar
|
||||
ln -s ${targetPackages.stdenv.cc.bintools}/bin/ar $out/bin/ar
|
||||
'';
|
||||
|
||||
# Hack to avoid TMPDIR in RPATHs.
|
||||
|
@ -118,23 +118,16 @@ let
|
||||
'';
|
||||
};
|
||||
|
||||
all-cabal-hashes-component = name: import (pkgs.runCommand "all-cabal-hashes-component-${name}.nix" {}
|
||||
''
|
||||
set +o pipefail
|
||||
for component in ${all-cabal-hashes}/*; do
|
||||
if ls $component | grep -q "^${name}$"; then
|
||||
echo "builtins.storePath $component" > $out
|
||||
exit 0
|
||||
fi
|
||||
done
|
||||
echo "${name} not found in any all-cabal-hashes component, are you sure it's in hackage?" >&2
|
||||
exit 1
|
||||
'');
|
||||
all-cabal-hashes-component = name: version: pkgs.runCommand "all-cabal-hashes-component-${name}-${version}" {} ''
|
||||
tar --wildcards -xzvf ${all-cabal-hashes} \*/${name}/${version}/${name}.{json,cabal}
|
||||
mkdir -p $out
|
||||
mv */${name}/${version}/${name}.{json,cabal} $out
|
||||
'';
|
||||
|
||||
hackage2nix = name: version: let component = all-cabal-hashes-component name; in self.haskellSrc2nix {
|
||||
hackage2nix = name: version: let component = all-cabal-hashes-component name version; in self.haskellSrc2nix {
|
||||
name = "${name}-${version}";
|
||||
sha256 = ''$(sed -e 's/.*"SHA256":"//' -e 's/".*$//' "${component}/${name}/${version}/${name}.json")'';
|
||||
src = "${component}/${name}/${version}/${name}.cabal";
|
||||
sha256 = ''$(sed -e 's/.*"SHA256":"//' -e 's/".*$//' "${component}/${name}.json")'';
|
||||
src = "${component}/${name}.cabal";
|
||||
};
|
||||
|
||||
in package-set { inherit pkgs stdenv callPackage; } self // {
|
||||
|
@ -48,7 +48,11 @@ stdenv.mkDerivation rec {
|
||||
libX11 libXau libXt libXpm xproto libXext xextproto
|
||||
];
|
||||
|
||||
patches = [ ./bits_ipctypes_to_sys_ipc.patch ]; # from Gentoo
|
||||
patches = [
|
||||
./bits_ipctypes_to_sys_ipc.patch # from Gentoo
|
||||
# The cfree alias no longer exists since glibc 2.26
|
||||
./remove-cfree-binding.patch
|
||||
];
|
||||
|
||||
# First, replace port 9090 (rather low, can be used)
|
||||
# with 64237 (much higher, IANA private area, not
|
||||
|
@ -0,0 +1,12 @@
|
||||
diff --git a/modules/bindings/glibc/linux.lisp b/modules/bindings/glibc/linux.lisp
|
||||
index c40b4f8..1c8edca 100644
|
||||
--- a/modules/bindings/glibc/linux.lisp
|
||||
+++ b/modules/bindings/glibc/linux.lisp
|
||||
@@ -648,7 +648,6 @@
|
||||
(def-call-out calloc (:arguments (nmemb size_t) (size size_t))
|
||||
(:return-type c-pointer))
|
||||
(def-call-out free (:arguments (ptr c-pointer)) (:return-type nil))
|
||||
-(def-call-out cfree (:arguments (ptr c-pointer)) (:return-type nil))
|
||||
(def-call-out valloc (:arguments (size size_t)) (:return-type c-pointer))
|
||||
|
||||
(def-call-out abort (:arguments) (:return-type nil))
|
@ -1,8 +1,8 @@
|
||||
{ mkDerivation, fetchurl }:
|
||||
|
||||
mkDerivation rec {
|
||||
version = "20.0";
|
||||
sha256 = "12dbay254ivnakwknjn5h55wndb0a0wqx55p156h8hwjhykj2kn0";
|
||||
version = "20.1";
|
||||
sha256 = "13f53lzgq2himg9kax41f66rzv5pjfrb1ln8b54yv9spkqx2hqqi";
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10'
|
||||
|
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.7.99";
|
||||
version = "17.10";
|
||||
name = "libmediainfo-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
|
||||
sha256 = "126nkxrzs6dxzm3hzx6smvw6xgrqr3zs6hdqvl2xmvqy10p8z6pc";
|
||||
sha256 = "00m1b4m37c9lm16yhh63p5pidg2sr3qvsw36672lklmcv3y1ic30";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
configureFlags = [ "--enable-shared" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postInstall = ''
|
||||
install -vD -m 644 libmediainfo.pc "$out/lib/pkgconfig/libmediainfo.pc"
|
||||
'';
|
||||
|
12
pkgs/development/libraries/libmsgpack/2.0.nix
Normal file
12
pkgs/development/libraries/libmsgpack/2.0.nix
Normal file
@ -0,0 +1,12 @@
|
||||
{ callPackage, fetchFromGitHub, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "msgpack";
|
||||
repo = "msgpack-c";
|
||||
rev = "cpp-${version}";
|
||||
sha256 = "189m44pwpcpf7g4yhzfla4djqyp2kl54wxmwfaj94gwgj5s370i7";
|
||||
};
|
||||
})
|
@ -1,12 +1,12 @@
|
||||
{ callPackage, fetchFromGitHub, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "2.0.0";
|
||||
version = "2.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "msgpack";
|
||||
repo = "msgpack-c";
|
||||
rev = "cpp-${version}";
|
||||
sha256 = "189m44pwpcpf7g4yhzfla4djqyp2kl54wxmwfaj94gwgj5s370i7";
|
||||
owner = "msgpack";
|
||||
repo = "msgpack-c";
|
||||
rev = "cpp-${version}";
|
||||
sha256 = "0n4kvma3dldfsvv7b0zw23qln6av5im2aqqd6m890i75zwwkw0zv";
|
||||
};
|
||||
})
|
||||
|
@ -11,16 +11,21 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
crossAttrs = {
|
||||
} // stdenv.lib.optionalAttrs (hostPlatform.libc == "msvcrt") {
|
||||
cmakeFlags = "-DMSGPACK_BUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=Windows";
|
||||
cmakeFlags = [
|
||||
"-DMSGPACK_BUILD_EXAMPLES=OFF"
|
||||
"-DCMAKE_SYSTEM_NAME=Windows"
|
||||
];
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "MessagePack implementation for C and C++";
|
||||
homepage = http://msgpack.org;
|
||||
homepage = http://msgpack.org;
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ redbaron wkennington ];
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.all;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "11m5lc51b0addhc4yq4rz0dwpv6k73rrj73wya3lqdk8rly6cjpm";
|
||||
addPrefixes = true;
|
||||
})
|
||||
# Required because of glibc 2.26
|
||||
./struct-ucontext.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
61
pkgs/development/libraries/libstdc++5/struct-ucontext.patch
Normal file
61
pkgs/development/libraries/libstdc++5/struct-ucontext.patch
Normal file
@ -0,0 +1,61 @@
|
||||
diff --git a/gcc/config/alpha/linux.h b/gcc/config/alpha/linux.h
|
||||
index 3a2940c..67f9899 100644
|
||||
--- a/gcc/config/alpha/linux.h
|
||||
+++ b/gcc/config/alpha/linux.h
|
||||
@@ -89,7 +89,7 @@ Boston, MA 02111-1307, USA. */
|
||||
{ \
|
||||
struct rt_sigframe { \
|
||||
struct siginfo info; \
|
||||
- struct ucontext uc; \
|
||||
+ ucontext_t uc; \
|
||||
} *rt_ = (CONTEXT)->cfa; \
|
||||
sc_ = &rt_->uc.uc_mcontext; \
|
||||
} \
|
||||
diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h
|
||||
index e86ab3d..30797a7 100644
|
||||
--- a/gcc/config/i386/linux.h
|
||||
+++ b/gcc/config/i386/linux.h
|
||||
@@ -260,7 +260,7 @@ Boston, MA 02111-1307, USA. */
|
||||
siginfo_t *pinfo; \
|
||||
void *puc; \
|
||||
siginfo_t info; \
|
||||
- struct ucontext uc; \
|
||||
+ ucontext_t uc; \
|
||||
} *rt_ = (CONTEXT)->cfa; \
|
||||
sc_ = (struct sigcontext *) &rt_->uc.uc_mcontext; \
|
||||
} \
|
||||
diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h
|
||||
index fbfaa58..200c8dc 100644
|
||||
--- a/gcc/config/i386/linux64.h
|
||||
+++ b/gcc/config/i386/linux64.h
|
||||
@@ -112,7 +112,7 @@ Boston, MA 02111-1307, USA. */
|
||||
if (*(unsigned char *)(pc_+0) == 0x48 \
|
||||
&& *(unsigned long *)(pc_+1) == 0x050f0000000fc0c7) \
|
||||
{ \
|
||||
- struct ucontext *uc_ = (CONTEXT)->cfa; \
|
||||
+ ucontext_t *uc_ = (CONTEXT)->cfa; \
|
||||
sc_ = (struct sigcontext *) &uc_->uc_mcontext; \
|
||||
} \
|
||||
else \
|
||||
@@ -182,7 +182,7 @@ Boston, MA 02111-1307, USA. */
|
||||
struct siginfo *pinfo; \
|
||||
void *puc; \
|
||||
struct siginfo info; \
|
||||
- struct ucontext uc; \
|
||||
+ ucontext_t uc; \
|
||||
} *rt_ = (CONTEXT)->cfa; \
|
||||
sc_ = (struct sigcontext *) &rt_->uc.uc_mcontext; \
|
||||
} \
|
||||
diff --git a/gcc/config/rs6000/linux.h b/gcc/config/rs6000/linux.h
|
||||
index ba70ec1..0fff8b1 100644
|
||||
--- a/gcc/config/rs6000/linux.h
|
||||
+++ b/gcc/config/rs6000/linux.h
|
||||
@@ -101,7 +101,7 @@ Boston, MA 02111-1307, USA. */
|
||||
|
||||
struct kernel_old_ucontext {
|
||||
unsigned long uc_flags;
|
||||
- struct ucontext *uc_link;
|
||||
+ ucontext_t *uc_link;
|
||||
stack_t uc_stack;
|
||||
struct sigcontext_struct uc_mcontext;
|
||||
sigset_t uc_sigmask;
|
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libtoxcore-${version}";
|
||||
version = "0.1.8";
|
||||
version = "0.1.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TokTok";
|
||||
repo = "c-toxcore";
|
||||
rev = "v${version}";
|
||||
sha256 = "08vdq3j60wn62lj2z9f3f47hibns93rvaqx5xc5bm3nglk70q7kk";
|
||||
sha256 = "1d3f7lnlxra2lhih838bvlahxqv50j35g9kfyzspq971sb5z30mv";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
@ -24,7 +24,11 @@ stdenv.mkDerivation rec {
|
||||
libopus
|
||||
libvpx
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
checkInputs = [ check ];
|
||||
|
||||
checkPhase = "ctest";
|
||||
|
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.4.35";
|
||||
version = "0.4.37";
|
||||
name = "libzen-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2";
|
||||
sha256 = "12a1icgcffgv503ii2k1453kxg5hfly09mf4zjcc80aq8a6rf8by";
|
||||
sha256 = "1hcsrmn85b0xp0mp33aazk7g071q1v3f163nnhv8b0mv9c4bgsfn";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
preConfigure = "sh autogen.sh";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Shared library for libmediainfo and mediainfo";
|
||||
homepage = https://mediaarea.net/;
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, makeWrapper
|
||||
{ stdenv, fetchFromGitHub, fetchurl, makeWrapper
|
||||
, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate
|
||||
, libvorbis, libxml2, movit, pkgconfig, sox
|
||||
, gtk2
|
||||
@ -15,6 +15,19 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0k9vj21n6qxdjd0vvj22cwi35igajjzh5fbjza766izdbijv2i2w";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix for glibc-2.26
|
||||
(fetchurl {
|
||||
url = "https://github.com/mltframework/mlt/commit/2125e3955a0d0be61571cf43b674f74b4b93c6f8.patch";
|
||||
sha256 = "1bgs5a3dblsmdmb7hwval9nmq1as4r4f48b3amsc23v69nsl2g0a";
|
||||
})
|
||||
# fix for glibc-2.26
|
||||
(fetchurl {
|
||||
url = "https://github.com/mltframework/mlt/commit/fbf6a5187776f2f392cf258935ff49e4c0e87024.patch";
|
||||
sha256 = "045vchpcznzsz47j67kxwdbg133kar66ssna3parnzrxdfqi72pv";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2
|
||||
makeWrapper movit pkgconfig sox
|
||||
|
@ -3,6 +3,8 @@
|
||||
, fftw, vid-stab, opencv3, ladspa-sdk
|
||||
}:
|
||||
|
||||
let inherit (stdenv.lib) getDev; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mlt-${version}";
|
||||
version = "6.4.1";
|
||||
@ -11,6 +13,18 @@ stdenv.mkDerivation rec {
|
||||
url = "https://github.com/mltframework/mlt/archive/v${version}.tar.gz";
|
||||
sha256 = "10m3ry0b2pvqx3bk34qh5dq337nn8pkc2gzfyhsj4nv9abskln47";
|
||||
};
|
||||
patches = [
|
||||
# fix for glibc-2.26
|
||||
(fetchurl {
|
||||
url = "https://github.com/mltframework/mlt/commit/2125e3955a0d0be61571cf43b674f74b4b93c6f8.patch";
|
||||
sha256 = "1bgs5a3dblsmdmb7hwval9nmq1as4r4f48b3amsc23v69nsl2g0a";
|
||||
})
|
||||
# fix for glibc-2.26
|
||||
(fetchurl {
|
||||
url = "https://github.com/mltframework/mlt/commit/fbf6a5187776f2f392cf258935ff49e4c0e87024.patch";
|
||||
sha256 = "045vchpcznzsz47j67kxwdbg133kar66ssna3parnzrxdfqi72pv";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2
|
||||
@ -27,6 +41,10 @@ stdenv.mkDerivation rec {
|
||||
"--enable-opengl"
|
||||
];
|
||||
|
||||
# mlt is unable to cope with our multi-prefix Qt build
|
||||
# because it does not use CMake or qmake.
|
||||
NIX_CFLAGS_COMPILE = [ "-I${getDev qtsvg}/include/QtSvg" ];
|
||||
|
||||
CXXFLAGS = "-std=c++11";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
@ -9,7 +9,11 @@ stdenv.mkDerivation {
|
||||
sha256 = "a28005986410d333e03d077679cdf6c504ec5a33342867dc0f9fb0b74285e333";
|
||||
};
|
||||
|
||||
patchPhase = "sed -e 's/lib64/lib/g' -i src/src.pro";
|
||||
postPatch = ''
|
||||
sed -i src/src.pro \
|
||||
-e 's/lib64/lib/g' \
|
||||
-e '/features.path =/ s|$$\[QMAKE_MKSPECS\]|$$NIX_OUTPUT_DEV/mkspecs|'
|
||||
'';
|
||||
|
||||
buildInputs = [ qt5.qtbase qca2-qt5 ];
|
||||
nativeBuildInputs = [ qt5.qmake ];
|
||||
|
@ -21,11 +21,23 @@ stdenv.mkDerivation rec {
|
||||
|
||||
preConfigure = ''
|
||||
cd Qt4Qt5
|
||||
${if withQt5
|
||||
then ''
|
||||
sed -i -e "s,\$\$\\[QT_INSTALL_LIBS\\],$out/lib," \
|
||||
-e "s,\$\$\\[QT_INSTALL_HEADERS\\],$out/include/," \
|
||||
-e "s,\$\$\\[QT_INSTALL_TRANSLATIONS\\],$out/translations," \
|
||||
-e "s,\$\$\\[QT_HOST_DATA\\]/mkspecs,$out/mkspecs," \
|
||||
-e "s,\$\$\\[QT_INSTALL_DATA\\]/mkspecs,$out/mkspecs," \
|
||||
-e "s,\$\$\\[QT_INSTALL_DATA\\],$out/share," \
|
||||
qscintilla.pro
|
||||
''
|
||||
else ''
|
||||
sed -i -e "s,\$\$\\[QT_INSTALL_LIBS\\],$out/lib," \
|
||||
-e "s,\$\$\\[QT_INSTALL_HEADERS\\],$out/include/," \
|
||||
-e "s,\$\$\\[QT_INSTALL_TRANSLATIONS\\],$out/share/qt/translations," \
|
||||
-e "s,\$\$\\[QT_INSTALL_DATA\\],$out/share/qt," \
|
||||
qscintilla.pro
|
||||
''}
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
@ -45,64 +45,39 @@ let
|
||||
mirror = "http://download.qt.io";
|
||||
srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
|
||||
|
||||
mkDerivation = args:
|
||||
stdenv.mkDerivation (args // {
|
||||
patches = {
|
||||
qtbase = [ ./qtbase.patch ];
|
||||
qtdeclarative = [ ./qtdeclarative.patch ];
|
||||
qtscript = [ ./qtscript.patch ];
|
||||
qtserialport = [ ./qtserialport.patch ];
|
||||
qttools = [ ./qttools.patch ];
|
||||
qtwebengine =
|
||||
[ ./qtwebengine.patch ]
|
||||
++ optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch;
|
||||
qtwebkit = [ ./qtwebkit.patch ];
|
||||
};
|
||||
|
||||
qmakeFlags =
|
||||
(args.qmakeFlags or [])
|
||||
++ optional (debug != null)
|
||||
(if debug then "CONFIG+=debug" else "CONFIG+=release");
|
||||
mkDerivation =
|
||||
import ../mkDerivation.nix
|
||||
{ inherit stdenv; inherit (stdenv) lib; }
|
||||
{ inherit debug; };
|
||||
|
||||
cmakeFlags =
|
||||
(args.cmakeFlags or [])
|
||||
++ [ "-DBUILD_TESTING=OFF" ]
|
||||
++ optional (debug != null)
|
||||
(if debug then "-DCMAKE_BUILD_TYPE=Debug"
|
||||
else "-DCMAKE_BUILD_TYPE=Release");
|
||||
|
||||
enableParallelBuilding = args.enableParallelBuilding or true;
|
||||
|
||||
});
|
||||
|
||||
qtSubmodule = args:
|
||||
let
|
||||
inherit (args) name;
|
||||
version = args.version or srcs."${name}".version;
|
||||
src = args.src or srcs."${name}".src;
|
||||
in mkDerivation (args // {
|
||||
name = "${name}-${version}";
|
||||
inherit src;
|
||||
|
||||
propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []);
|
||||
nativeBuildInputs =
|
||||
(args.nativeBuildInputs or [])
|
||||
++ [ perl self.qmake ];
|
||||
|
||||
NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true;
|
||||
|
||||
outputs = args.outputs or [ "out" "dev" ];
|
||||
setOutputFlags = args.setOutputFlags or false;
|
||||
|
||||
setupHook = ../qtsubmodule-setup-hook.sh;
|
||||
|
||||
meta = {
|
||||
homepage = http://www.qt.io;
|
||||
description = "A cross-platform application framework for C++";
|
||||
license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
|
||||
maintainers = with maintainers; [ qknight ttuegel periklis ];
|
||||
platforms = platforms.unix;
|
||||
} // (args.meta or {});
|
||||
});
|
||||
qtModule =
|
||||
import ../qtModule.nix
|
||||
{ inherit mkDerivation perl; inherit (stdenv) lib; }
|
||||
{ inherit self srcs patches; };
|
||||
|
||||
addPackages = self: with self;
|
||||
let
|
||||
callPackage = self.newScope { inherit qtCompatVersion qtSubmodule srcs; };
|
||||
callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; };
|
||||
in {
|
||||
|
||||
inherit mkDerivation;
|
||||
|
||||
qtbase = callPackage ./qtbase {
|
||||
qtbase = callPackage ../modules/qtbase.nix {
|
||||
inherit bison cups harfbuzz mesa;
|
||||
inherit (srcs.qtbase) src version;
|
||||
patches = patches.qtbase;
|
||||
inherit developerBuild decryptSslTraffic;
|
||||
};
|
||||
|
||||
@ -110,47 +85,46 @@ let
|
||||
/* qtactiveqt = not packaged */
|
||||
/* qtandroidextras = not packaged */
|
||||
/* qtcanvas3d = not packaged */
|
||||
qtconnectivity = callPackage ./qtconnectivity.nix {};
|
||||
qtdeclarative = callPackage ./qtdeclarative {};
|
||||
qtdoc = callPackage ./qtdoc.nix {};
|
||||
qtenginio = callPackage ./qtenginio.nix {};
|
||||
qtgraphicaleffects = callPackage ./qtgraphicaleffects.nix {};
|
||||
qtimageformats = callPackage ./qtimageformats.nix {};
|
||||
qtlocation = callPackage ./qtlocation.nix {};
|
||||
qtconnectivity = callPackage ../modules/qtconnectivity.nix {};
|
||||
qtdeclarative = callPackage ../modules/qtdeclarative.nix {};
|
||||
qtdoc = callPackage ../modules/qtdoc.nix {};
|
||||
qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {};
|
||||
qtimageformats = callPackage ../modules/qtimageformats.nix {};
|
||||
qtlocation = callPackage ../modules/qtlocation.nix {};
|
||||
/* qtmacextras = not packaged */
|
||||
qtmultimedia = callPackage ./qtmultimedia.nix {
|
||||
qtmultimedia = callPackage ../modules/qtmultimedia.nix {
|
||||
inherit gstreamer gst-plugins-base;
|
||||
};
|
||||
qtquick1 = null;
|
||||
qtquickcontrols = callPackage ./qtquickcontrols.nix {};
|
||||
qtquickcontrols2 = callPackage ./qtquickcontrols2.nix {};
|
||||
qtscript = callPackage ./qtscript {};
|
||||
qtsensors = callPackage ./qtsensors.nix {};
|
||||
qtserialport = callPackage ./qtserialport {};
|
||||
qtsvg = callPackage ./qtsvg.nix {};
|
||||
qttools = callPackage ./qttools {};
|
||||
qttranslations = callPackage ./qttranslations.nix {};
|
||||
qtwayland = callPackage ./qtwayland.nix {};
|
||||
qtwebchannel = callPackage ./qtwebchannel.nix {};
|
||||
qtwebengine = callPackage ./qtwebengine {};
|
||||
qtwebkit = callPackage ./qtwebkit {};
|
||||
qtwebsockets = callPackage ./qtwebsockets.nix {};
|
||||
qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {};
|
||||
qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {};
|
||||
qtscript = callPackage ../modules/qtscript.nix {};
|
||||
qtsensors = callPackage ../modules/qtsensors.nix {};
|
||||
qtserialport = callPackage ../modules/qtserialport.nix {};
|
||||
qtsvg = callPackage ../modules/qtsvg.nix {};
|
||||
qttools = callPackage ../modules/qttools.nix {};
|
||||
qttranslations = callPackage ../modules/qttranslations.nix {};
|
||||
qtwayland = callPackage ../modules/qtwayland.nix {};
|
||||
qtwebchannel = callPackage ../modules/qtwebchannel.nix {};
|
||||
qtwebengine = callPackage ../modules/qtwebengine.nix {};
|
||||
qtwebkit = callPackage ../modules/qtwebkit.nix {};
|
||||
qtwebsockets = callPackage ../modules/qtwebsockets.nix {};
|
||||
/* qtwinextras = not packaged */
|
||||
qtx11extras = callPackage ./qtx11extras.nix {};
|
||||
qtxmlpatterns = callPackage ./qtxmlpatterns.nix {};
|
||||
qtx11extras = callPackage ../modules/qtx11extras.nix {};
|
||||
qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {};
|
||||
|
||||
env = callPackage ../qt-env.nix {};
|
||||
full = env "qt-${qtbase.version}" [
|
||||
qtconnectivity qtdeclarative qtdoc qtenginio qtgraphicaleffects
|
||||
qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2
|
||||
qtscript qtsensors qtserialport qtsvg qttools qttranslations qtwayland
|
||||
qtconnectivity qtdeclarative qtdoc qtgraphicaleffects qtimageformats
|
||||
qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 qtscript
|
||||
qtsensors qtserialport qtsvg qttools qttranslations qtwayland
|
||||
qtwebchannel qtwebengine qtwebkit qtwebsockets qtx11extras qtxmlpatterns
|
||||
];
|
||||
|
||||
qmake = makeSetupHook {
|
||||
deps = [ self.qtbase.dev ];
|
||||
substitutions = { inherit (stdenv) isDarwin; };
|
||||
} ../qmake-hook.sh;
|
||||
} ../hooks/qmake-hook.sh;
|
||||
};
|
||||
|
||||
self = makeScope newScope addPackages;
|
||||
|
773
pkgs/development/libraries/qt-5/5.6/qtbase.patch
Normal file
773
pkgs/development/libraries/qt-5/5.6/qtbase.patch
Normal file
@ -0,0 +1,773 @@
|
||||
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
|
||||
index 11fb52a0b1..a4cca1fdcb 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
|
||||
@@ -47,47 +47,22 @@ 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
|
||||
|
||||
!exists($$first(QT.$${MODULE}_private.includes)): CMAKE_NO_PRIVATE_INCLUDES = 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_LIB_DIR = $$NIX_OUTPUT_DEV/lib/
|
||||
+CMAKE_LIB_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_BIN_DIR = $$NIX_OUTPUT_BIN/bin/
|
||||
+CMAKE_BIN_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
|
||||
-}
|
||||
+CMAKE_PLUGIN_DIR = $$NIX_OUTPUT_PLUGIN/
|
||||
+CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True
|
||||
|
||||
-win32:!wince:!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_DLL_DIR = $$NIX_OUTPUT_DEV/lib/
|
||||
+CMAKE_DLL_DIR_IS_ABSOLUTE = True
|
||||
|
||||
static|staticlib:CMAKE_STATIC_TYPE = true
|
||||
|
||||
@@ -167,7 +142,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()
|
||||
@@ -314,7 +289,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 d2358cae4b..61d8cc0471 100644
|
||||
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
@@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0)
|
||||
endif()
|
||||
!!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}.MAJOR_VERSION).$$eval(QT.$${MODULE}.MINOR_VERSION).$$eval(QT.$${MODULE}.PATCH_VERSION)")
|
||||
@@ -58,11 +34,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}\"
|
||||
@@ -75,11 +47,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
|
||||
@@ -95,24 +63,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}Qt$${CMAKE_MODULE_NAME}.framework\"
|
||||
- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\"
|
||||
+ \"$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\"
|
||||
+ \"$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.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}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\"
|
||||
- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.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}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\"
|
||||
+ \"$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\"
|
||||
)
|
||||
!!ELSE
|
||||
set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
|
||||
@@ -128,7 +85,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
|
||||
@@ -254,25 +210,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()
|
||||
@@ -291,25 +235,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()
|
||||
@@ -328,11 +260,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 b09d42a0a4..f076265bdd 100644
|
||||
--- a/mkspecs/features/qml_module.prf
|
||||
+++ b/mkspecs/features/qml_module.prf
|
||||
@@ -17,10 +17,7 @@ fq_qml_files = $$_PRO_FILE_PWD_/qmldir
|
||||
|
||||
for(qmlf, QML_FILES): fq_qml_files += $$absolute_path($$qmlf, $$_PRO_FILE_PWD_)
|
||||
|
||||
-qml1_target: \
|
||||
- instbase = $$[QT_INSTALL_IMPORTS]
|
||||
-else: \
|
||||
- instbase = $$[QT_INSTALL_QML]
|
||||
+instbase = $$NIX_OUTPUT_QML
|
||||
|
||||
# Install rules
|
||||
qmldir.base = $$_PRO_FILE_PWD_
|
||||
diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf
|
||||
index ebec1db8da..62ace84a6c 100644
|
||||
--- a/mkspecs/features/qml_plugin.prf
|
||||
+++ b/mkspecs/features/qml_plugin.prf
|
||||
@@ -46,13 +46,8 @@ exists($$QMLTYPEFILE): QML_FILES += $$QMLTYPEFILE
|
||||
|
||||
load(qt_build_paths)
|
||||
|
||||
-qml1_target {
|
||||
- DESTDIR = $$MODULE_BASE_OUTDIR/imports/$$TARGETPATH
|
||||
- instbase = $$[QT_INSTALL_IMPORTS]
|
||||
-} else {
|
||||
- DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH
|
||||
- instbase = $$[QT_INSTALL_QML]
|
||||
-}
|
||||
+DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH
|
||||
+instbase = $$NIX_OUTPUT_QML
|
||||
|
||||
target.path = $$instbase/$$TARGETPATH
|
||||
INSTALLS += target
|
||||
diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf
|
||||
index 46aca50cc2..4f4e634724 100644
|
||||
--- a/mkspecs/features/qt_app.prf
|
||||
+++ b/mkspecs/features/qt_app.prf
|
||||
@@ -29,7 +29,7 @@ host_build:force_bootstrap {
|
||||
target.path = $$[QT_HOST_BINS]
|
||||
} else {
|
||||
!build_pass:contains(QT_CONFIG, 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 1848f00e90..2af93675c5 100644
|
||||
--- a/mkspecs/features/qt_build_paths.prf
|
||||
+++ b/mkspecs/features/qt_build_paths.prf
|
||||
@@ -23,6 +23,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_common.prf b/mkspecs/features/qt_common.prf
|
||||
index c1809468af..0a12ec24db 100644
|
||||
--- a/mkspecs/features/qt_common.prf
|
||||
+++ b/mkspecs/features/qt_common.prf
|
||||
@@ -30,8 +30,8 @@ contains(TEMPLATE, .*lib) {
|
||||
qqt_libdir = \$\$\$\$[QT_HOST_LIBS]
|
||||
qt_libdir = $$[QT_HOST_LIBS]
|
||||
} else {
|
||||
- qqt_libdir = \$\$\$\$[QT_INSTALL_LIBS]
|
||||
- qt_libdir = $$[QT_INSTALL_LIBS]
|
||||
+ qqt_libdir = \$\$\$\$NIX_OUTPUT_OUT/lib
|
||||
+ qt_libdir = $$NIX_OUTPUT_OUT/lib
|
||||
}
|
||||
contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) {
|
||||
lib_replace.match = "[^ ']*$$rplbase/lib"
|
||||
diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf
|
||||
index 183d0c9502..17982b04ec 100644
|
||||
--- a/mkspecs/features/qt_docs.prf
|
||||
+++ b/mkspecs/features/qt_docs.prf
|
||||
@@ -41,7 +41,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) {
|
||||
@@ -60,8 +60,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)
|
||||
}
|
||||
doc_command = $$QDOC $$QMAKE_DOCS
|
||||
prepare_docs {
|
||||
@@ -75,12 +75,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 4c68cfd72f..f422f18266 100644
|
||||
--- a/mkspecs/features/qt_example_installs.prf
|
||||
+++ b/mkspecs/features/qt_example_installs.prf
|
||||
@@ -70,7 +70,7 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples)
|
||||
$$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 4a1d265a8b..abe0da95f6 100644
|
||||
--- a/mkspecs/features/qt_functions.prf
|
||||
+++ b/mkspecs/features/qt_functions.prf
|
||||
@@ -70,7 +70,7 @@ defineTest(qtHaveModule) {
|
||||
defineTest(qtPrepareTool) {
|
||||
cmd = $$eval(QT_TOOL.$${2}.binary)
|
||||
isEmpty(cmd) {
|
||||
- cmd = $$[QT_HOST_BINS]/$$2
|
||||
+ cmd = $$system("type -p $$2")
|
||||
exists($${cmd}.pl) {
|
||||
cmd = perl -w $$system_path($${cmd}.pl)
|
||||
} else: contains(QMAKE_HOST.os, Windows) {
|
||||
diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf
|
||||
index 3a5dbb6274..24f321bd82 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,33 +23,33 @@
|
||||
#headers
|
||||
qt_install_headers {
|
||||
class_headers.files = $$SYNCQT.HEADER_CLASSES
|
||||
- class_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME
|
||||
+ class_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME
|
||||
INSTALLS += class_headers
|
||||
|
||||
targ_headers.files = $$SYNCQT.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
|
||||
- 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
|
||||
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 3cf6c7349c..83e68025a5 100644
|
||||
--- a/mkspecs/features/qt_plugin.prf
|
||||
+++ b/mkspecs/features/qt_plugin.prf
|
||||
@@ -82,7 +82,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)
|
||||
diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
|
||||
index 91a4eb619a..08b533e69c 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
|
||||
@@ -131,7 +131,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
|
||||
@@ -145,7 +145,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/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
|
||||
index f5b15207cc..f85e0524bb 100644
|
||||
--- a/src/corelib/kernel/qcoreapplication.cpp
|
||||
+++ b/src/corelib/kernel/qcoreapplication.cpp
|
||||
@@ -2533,6 +2533,15 @@ QStringList QCoreApplication::libraryPaths()
|
||||
QStringList *app_libpaths = new QStringList;
|
||||
coreappdata()->app_libpaths.reset(app_libpaths);
|
||||
|
||||
+ // Add library paths derived from PATH
|
||||
+ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':');
|
||||
+ const QString plugindir = QStringLiteral("../" NIXPKGS_QT_PLUGIN_PREFIX);
|
||||
+ for (const QString &path: paths) {
|
||||
+ if (!path.isEmpty()) {
|
||||
+ app_libpaths->append(QDir::cleanPath(path + QDir::separator() + plugindir));
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH");
|
||||
if (!libPathEnv.isEmpty()) {
|
||||
QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts);
|
||||
diff --git a/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/tools/qtimezoneprivate_tz.cpp
|
||||
index c13c9a5223..6936851511 100644
|
||||
--- a/src/corelib/tools/qtimezoneprivate_tz.cpp
|
||||
+++ b/src/corelib/tools/qtimezoneprivate_tz.cpp
|
||||
@@ -64,7 +64,11 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash;
|
||||
// Parse zone.tab table, assume lists all installed zones, if not will need to read directories
|
||||
static QTzTimeZoneHash loadTzTimeZones()
|
||||
{
|
||||
- QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab");
|
||||
+ // Try TZDIR first, in case we're running on NixOS.
|
||||
+ QString path = QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/zone.tab");
|
||||
+ // Fallback to traditional paths in case we are not on NixOS.
|
||||
+ if (!QFile::exists(path))
|
||||
+ path = QStringLiteral("/usr/share/zoneinfo/zone.tab");
|
||||
if (!QFile::exists(path))
|
||||
path = QStringLiteral("/usr/lib/zoneinfo/zone.tab");
|
||||
|
||||
@@ -636,12 +640,16 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId)
|
||||
if (!tzif.open(QIODevice::ReadOnly))
|
||||
return;
|
||||
} else {
|
||||
- // Open named tz, try modern path first, if fails try legacy path
|
||||
- tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId));
|
||||
+ // Try TZDIR first, in case we're running on NixOS
|
||||
+ tzif.setFileName(QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/") + QString::fromLocal8Bit(ianaId));
|
||||
if (!tzif.open(QIODevice::ReadOnly)) {
|
||||
- tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId));
|
||||
- if (!tzif.open(QIODevice::ReadOnly))
|
||||
- return;
|
||||
+ // Open named tz, try modern path first, if fails try legacy path
|
||||
+ tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId));
|
||||
+ if (!tzif.open(QIODevice::ReadOnly)) {
|
||||
+ tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId));
|
||||
+ if (!tzif.open(QIODevice::ReadOnly))
|
||||
+ return;
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
||||
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 07869efd7d..37b95d1b6b 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_DEV/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
|
||||
!!ELSE
|
||||
set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
|
||||
!!ENDIF
|
||||
diff --git a/src/network/kernel/qdnslookup_unix.cpp b/src/network/kernel/qdnslookup_unix.cpp
|
||||
index 584f0b0f0e..24d80063f2 100644
|
||||
--- a/src/network/kernel/qdnslookup_unix.cpp
|
||||
+++ b/src/network/kernel/qdnslookup_unix.cpp
|
||||
@@ -83,7 +83,7 @@ static bool resolveLibraryInternal()
|
||||
if (!lib.load())
|
||||
#endif
|
||||
{
|
||||
- lib.setFileName(QLatin1String("resolv"));
|
||||
+ lib.setFileName(QLatin1String(NIXPKGS_LIBRESOLV));
|
||||
if (!lib.load())
|
||||
return false;
|
||||
}
|
||||
diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp
|
||||
index dabf1913cc..53bb867e07 100644
|
||||
--- a/src/network/kernel/qhostinfo_unix.cpp
|
||||
+++ b/src/network/kernel/qhostinfo_unix.cpp
|
||||
@@ -94,7 +94,7 @@ static bool resolveLibraryInternal()
|
||||
if (!lib.load())
|
||||
#endif
|
||||
{
|
||||
- lib.setFileName(QLatin1String("resolv"));
|
||||
+ lib.setFileName(QLatin1String(NIXPKGS_LIBRESOLV));
|
||||
if (!lib.load())
|
||||
return false;
|
||||
}
|
||||
diff --git a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp
|
||||
index 68caaeb6dc..fef4a81474 100644
|
||||
--- a/src/network/ssl/qsslcontext_openssl.cpp
|
||||
+++ b/src/network/ssl/qsslcontext_openssl.cpp
|
||||
@@ -340,7 +340,7 @@ init_context:
|
||||
|
||||
const QVector<QSslEllipticCurve> qcurves = sslContext->sslConfiguration.ellipticCurves();
|
||||
if (!qcurves.isEmpty()) {
|
||||
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC)
|
||||
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && defined(SSL_CTRL_SET_CURVES) && !defined(OPENSSL_NO_EC)
|
||||
// Set the curves to be used
|
||||
if (q_SSLeay() >= 0x10002000L) {
|
||||
// SSL_CTX_ctrl wants a non-const pointer as last argument,
|
||||
@@ -354,7 +354,7 @@ init_context:
|
||||
return sslContext;
|
||||
}
|
||||
} else
|
||||
-#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC)
|
||||
+#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && defined(SSL_CTRL_SET_CURVES) && !defined(OPENSSL_NO_EC)
|
||||
{
|
||||
// specific curves requested, but not possible to set -> error
|
||||
sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocket::tr("OpenSSL version too old, need at least v1.0.2"));
|
||||
diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
|
||||
index 44f1d7e6ba..e24fe54326 100644
|
||||
--- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
|
||||
+++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
|
||||
@@ -251,12 +251,9 @@ void TableGenerator::initPossibleLocations()
|
||||
// the QTCOMPOSE environment variable
|
||||
if (qEnvironmentVariableIsSet("QTCOMPOSE"))
|
||||
m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE")));
|
||||
- m_possibleLocations.append(QStringLiteral("/usr/share/X11/locale"));
|
||||
- m_possibleLocations.append(QStringLiteral("/usr/local/share/X11/locale"));
|
||||
- m_possibleLocations.append(QStringLiteral("/usr/lib/X11/locale"));
|
||||
- m_possibleLocations.append(QStringLiteral("/usr/local/lib/X11/locale"));
|
||||
m_possibleLocations.append(QStringLiteral(X11_PREFIX "/share/X11/locale"));
|
||||
m_possibleLocations.append(QStringLiteral(X11_PREFIX "/lib/X11/locale"));
|
||||
+ m_possibleLocations.append(QLatin1String(NIXPKGS_QTCOMPOSE));
|
||||
}
|
||||
|
||||
QString TableGenerator::findComposeFile()
|
||||
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
|
||||
index 9bdedcc830..2559b2066b 100644
|
||||
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
|
||||
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
|
||||
@@ -570,7 +570,14 @@ void (*QGLXContext::getProcAddress(const QByteArray &procName)) ()
|
||||
#ifndef QT_NO_LIBRARY
|
||||
extern const QString qt_gl_library_name();
|
||||
// QLibrary lib(qt_gl_library_name());
|
||||
+ // Check system library paths first
|
||||
QLibrary lib(QLatin1String("GL"));
|
||||
+#ifdef NIXPKGS_MESA_GL
|
||||
+ if (!lib.load()) {
|
||||
+ // Fallback to Mesa driver
|
||||
+ lib.setFileName(QLatin1String(NIXPKGS_MESA_GL));
|
||||
+ }
|
||||
+#endif // NIXPKGS_MESA_GL
|
||||
glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB");
|
||||
#endif
|
||||
}
|
||||
diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp
|
||||
index b321ed95dc..9e7a72521c 100644
|
||||
--- a/src/plugins/platforms/xcb/qxcbcursor.cpp
|
||||
+++ b/src/plugins/platforms/xcb/qxcbcursor.cpp
|
||||
@@ -303,10 +303,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen)
|
||||
#if defined(XCB_USE_XLIB) && !defined(QT_NO_LIBRARY)
|
||||
static bool function_ptrs_not_initialized = true;
|
||||
if (function_ptrs_not_initialized) {
|
||||
- QLibrary xcursorLib(QLatin1String("Xcursor"), 1);
|
||||
+ QLibrary xcursorLib(QLatin1String(NIXPKGS_LIBXCURSOR), 1);
|
||||
bool xcursorFound = xcursorLib.load();
|
||||
if (!xcursorFound) { // try without the version number
|
||||
- xcursorLib.setFileName(QLatin1String("Xcursor"));
|
||||
+ xcursorLib.setFileName(QLatin1String(NIXPKGS_LIBXCURSOR));
|
||||
xcursorFound = xcursorLib.load();
|
||||
}
|
||||
if (xcursorFound) {
|
||||
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
|
@ -1,8 +1,8 @@
|
||||
Index: qtdeclarative-opensource-src-5.8.0/src/qml/qml/qqmlimport.cpp
|
||||
===================================================================
|
||||
--- qtdeclarative-opensource-src-5.8.0.orig/src/qml/qml/qqmlimport.cpp
|
||||
+++ qtdeclarative-opensource-src-5.8.0/src/qml/qml/qqmlimport.cpp
|
||||
@@ -1630,6 +1630,15 @@ QQmlImportDatabase::QQmlImportDatabase(Q
|
||||
diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp
|
||||
index dfdf2edbe..7ee96049d 100644
|
||||
--- a/src/qml/qml/qqmlimport.cpp
|
||||
+++ b/src/qml/qml/qqmlimport.cpp
|
||||
@@ -1568,6 +1568,15 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e)
|
||||
QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath);
|
||||
addImportPath(installImportsPath);
|
||||
|
@ -1,12 +1,3 @@
|
||||
From abd80356449bb36c8adcc5c9ca1df6b47715d265 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Tuegel <ttuegel@gmail.com>
|
||||
Date: Sun, 23 Aug 2015 09:13:34 -0500
|
||||
Subject: [PATCH] glib-2.32
|
||||
|
||||
---
|
||||
src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
|
||||
index 1f6d25e..087c3fb 100644
|
||||
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
|
||||
@ -20,6 +11,3 @@ index 1f6d25e..087c3fb 100644
|
||||
typedef struct _GCond GCond;
|
||||
#endif
|
||||
|
||||
--
|
||||
2.5.0
|
||||
|
@ -1,8 +1,8 @@
|
||||
Index: qtserialport-opensource-src-5.8.0/src/serialport/qtudev_p.h
|
||||
===================================================================
|
||||
--- qtserialport-opensource-src-5.8.0.orig/src/serialport/qtudev_p.h
|
||||
+++ qtserialport-opensource-src-5.8.0/src/serialport/qtudev_p.h
|
||||
@@ -111,9 +111,17 @@ inline QFunctionPointer resolveSymbol(QL
|
||||
diff --git a/src/serialport/qtudev_p.h b/src/serialport/qtudev_p.h
|
||||
index 6f2cabd..cd3c0ed 100644
|
||||
--- a/src/serialport/qtudev_p.h
|
||||
+++ b/src/serialport/qtudev_p.h
|
||||
@@ -105,9 +105,17 @@ inline QFunctionPointer resolveSymbol(QLibrary *udevLibrary, const char *symbolN
|
||||
inline bool resolveSymbols(QLibrary *udevLibrary)
|
||||
{
|
||||
if (!udevLibrary->isLoaded()) {
|
64
pkgs/development/libraries/qt-5/5.6/qttools.patch
Normal file
64
pkgs/development/libraries/qt-5/5.6/qttools.patch
Normal file
@ -0,0 +1,64 @@
|
||||
diff --git a/src/assistant/help/Qt5HelpConfigExtras.cmake.in b/src/assistant/help/Qt5HelpConfigExtras.cmake.in
|
||||
index 5a5bd5ce..1c6727d4 100644
|
||||
--- a/src/assistant/help/Qt5HelpConfigExtras.cmake.in
|
||||
+++ b/src/assistant/help/Qt5HelpConfigExtras.cmake.in
|
||||
@@ -2,14 +2,13 @@
|
||||
if (NOT TARGET Qt5::qcollectiongenerator)
|
||||
add_executable(Qt5::qcollectiongenerator IMPORTED)
|
||||
|
||||
-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
|
||||
- set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
|
||||
-!!ELSE
|
||||
set(imported_location \"$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
|
||||
-!!ENDIF
|
||||
+ if(NOT EXISTS \"${imported_location}\")
|
||||
+ set(imported_location \"$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
|
||||
+ endif()
|
||||
_qt5_Help_check_file_exists(${imported_location})
|
||||
|
||||
set_target_properties(Qt5::qcollectiongenerator PROPERTIES
|
||||
IMPORTED_LOCATION ${imported_location}
|
||||
)
|
||||
-endif()
|
||||
+endif()
|
||||
\ No newline at end of file
|
||||
diff --git a/src/linguist/Qt5LinguistToolsConfig.cmake.in b/src/linguist/Qt5LinguistToolsConfig.cmake.in
|
||||
index 4318b16f..d60db4ff 100644
|
||||
--- a/src/linguist/Qt5LinguistToolsConfig.cmake.in
|
||||
+++ b/src/linguist/Qt5LinguistToolsConfig.cmake.in
|
||||
@@ -44,11 +44,7 @@ endmacro()
|
||||
if (NOT TARGET Qt5::lrelease)
|
||||
add_executable(Qt5::lrelease IMPORTED)
|
||||
|
||||
-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
|
||||
- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
|
||||
-!!ELSE
|
||||
set(imported_location \"$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
|
||||
-!!ENDIF
|
||||
_qt5_LinguistTools_check_file_exists(${imported_location})
|
||||
|
||||
set_target_properties(Qt5::lrelease PROPERTIES
|
||||
@@ -59,11 +55,7 @@ endif()
|
||||
if (NOT TARGET Qt5::lupdate)
|
||||
add_executable(Qt5::lupdate IMPORTED)
|
||||
|
||||
-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
|
||||
- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
|
||||
-!!ELSE
|
||||
set(imported_location \"$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
|
||||
-!!ENDIF
|
||||
_qt5_LinguistTools_check_file_exists(${imported_location})
|
||||
|
||||
set_target_properties(Qt5::lupdate PROPERTIES
|
||||
@@ -74,11 +66,7 @@ endif()
|
||||
if (NOT TARGET Qt5::lconvert)
|
||||
add_executable(Qt5::lconvert IMPORTED)
|
||||
|
||||
-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
|
||||
- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
|
||||
-!!ELSE
|
||||
set(imported_location \"$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
|
||||
-!!ENDIF
|
||||
_qt5_LinguistTools_check_file_exists(${imported_location})
|
||||
|
||||
set_target_properties(Qt5::lconvert PROPERTIES
|
77
pkgs/development/libraries/qt-5/5.6/qtwebkit.patch
Normal file
77
pkgs/development/libraries/qt-5/5.6/qtwebkit.patch
Normal file
@ -0,0 +1,77 @@
|
||||
diff --git a/Source/WTF/WTF.pri b/Source/WTF/WTF.pri
|
||||
index 1f4866d66..bb61e4ba3 100644
|
||||
--- a/Source/WTF/WTF.pri
|
||||
+++ b/Source/WTF/WTF.pri
|
||||
@@ -12,7 +12,7 @@ mac {
|
||||
# Mac OS does ship libicu but not the associated header files.
|
||||
# Therefore WebKit provides adequate header files.
|
||||
INCLUDEPATH = $${ROOT_WEBKIT_DIR}/Source/WTF/icu $$INCLUDEPATH
|
||||
- LIBS += -licucore
|
||||
+ LIBS += /usr/lib/libicucore.dylib
|
||||
} else:!use?(wchar_unicode): {
|
||||
win32 {
|
||||
CONFIG(static, static|shared) {
|
||||
diff --git a/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/Source/WebCore/plugins/qt/PluginPackageQt.cpp
|
||||
index a923d49aa..46772a4bb 100644
|
||||
--- a/Source/WebCore/plugins/qt/PluginPackageQt.cpp
|
||||
+++ b/Source/WebCore/plugins/qt/PluginPackageQt.cpp
|
||||
@@ -136,7 +136,11 @@ static void initializeGtk(QLibrary* module = 0)
|
||||
}
|
||||
}
|
||||
|
||||
+#ifdef NIXPKGS_LIBGTK2
|
||||
+ QLibrary library(QLatin1String(NIXPKGS_LIBGTK2), 0);
|
||||
+#else
|
||||
QLibrary library(QLatin1String("libgtk-x11-2.0"), 0);
|
||||
+#endif
|
||||
if (library.load()) {
|
||||
typedef void *(*gtk_init_check_ptr)(int*, char***);
|
||||
gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check");
|
||||
diff --git a/Source/WebCore/plugins/qt/PluginViewQt.cpp b/Source/WebCore/plugins/qt/PluginViewQt.cpp
|
||||
index de06a2fea..86fe39ef1 100644
|
||||
--- a/Source/WebCore/plugins/qt/PluginViewQt.cpp
|
||||
+++ b/Source/WebCore/plugins/qt/PluginViewQt.cpp
|
||||
@@ -697,7 +697,11 @@ static Display *getPluginDisplay()
|
||||
// support gdk based plugins (like flash) that use a different X connection.
|
||||
// The code below has the same effect as this one:
|
||||
// Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
|
||||
+#ifdef NIXPKGS_LIBGDK2
|
||||
+ QLibrary library(QLatin1String(NIXPKGS_LIBGDK2), 0);
|
||||
+#else
|
||||
QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
|
||||
+#endif
|
||||
if (!library.load())
|
||||
return 0;
|
||||
|
||||
diff --git a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
|
||||
index 8de65216b..38f5c05e5 100644
|
||||
--- a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
|
||||
+++ b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
|
||||
@@ -53,7 +53,11 @@ static void messageHandler(QtMsgType type, const QMessageLogContext&, const QStr
|
||||
|
||||
static bool initializeGtk()
|
||||
{
|
||||
+#ifdef NIXPKGS_LIBGTK2
|
||||
+ QLibrary gtkLibrary(QLatin1String(NIXPKGS_LIBGTK2), 0);
|
||||
+#else
|
||||
QLibrary gtkLibrary(QLatin1String("libgtk-x11-2.0"), 0);
|
||||
+#endif
|
||||
if (!gtkLibrary.load())
|
||||
return false;
|
||||
typedef void* (*gtk_init_ptr)(void*, void*);
|
||||
diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
|
||||
index d734ff684..0f6ff63d1 100644
|
||||
--- a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
|
||||
+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
|
||||
@@ -64,7 +64,11 @@ static Display* getPluginDisplay()
|
||||
// The code below has the same effect as this one:
|
||||
// Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
|
||||
|
||||
+#ifdef NIXPKGS_LIBGDK2
|
||||
+ QLibrary library(QLatin1String(NIXPKGS_LIBGDK2), 0);
|
||||
+#else
|
||||
QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
|
||||
+#endif
|
||||
if (!library.load())
|
||||
return 0;
|
||||
|
@ -36,96 +36,68 @@ let
|
||||
mirror = "http://download.qt.io";
|
||||
srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
|
||||
|
||||
mkDerivation = args:
|
||||
stdenv.mkDerivation (args // {
|
||||
patches = {
|
||||
qtbase = [ ./qtbase.patch ];
|
||||
qtdeclarative = [ ./qtdeclarative.patch ];
|
||||
qtscript = [ ./qtscript.patch ];
|
||||
qtserialport = [ ./qtserialport.patch ];
|
||||
qttools = [ ./qttools.patch ];
|
||||
qtwebengine = optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch;
|
||||
qtwebkit = [ ./qtwebkit.patch ];
|
||||
};
|
||||
|
||||
qmakeFlags =
|
||||
(args.qmakeFlags or [])
|
||||
++ optional (debug != null)
|
||||
(if debug then "CONFIG+=debug" else "CONFIG+=release");
|
||||
mkDerivation =
|
||||
import ../mkDerivation.nix
|
||||
{ inherit stdenv; inherit (stdenv) lib; }
|
||||
{ inherit debug; };
|
||||
|
||||
cmakeFlags =
|
||||
(args.cmakeFlags or [])
|
||||
++ [ "-DBUILD_TESTING=OFF" ]
|
||||
++ optional (debug != null)
|
||||
(if debug then "-DCMAKE_BUILD_TYPE=Debug"
|
||||
else "-DCMAKE_BUILD_TYPE=Release");
|
||||
|
||||
enableParallelBuilding = args.enableParallelBuilding or true;
|
||||
|
||||
});
|
||||
|
||||
qtSubmodule = args:
|
||||
let
|
||||
inherit (args) name;
|
||||
version = args.version or srcs."${name}".version;
|
||||
src = args.src or srcs."${name}".src;
|
||||
in mkDerivation (args // {
|
||||
name = "${name}-${version}";
|
||||
inherit src;
|
||||
|
||||
propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []);
|
||||
nativeBuildInputs =
|
||||
(args.nativeBuildInputs or [])
|
||||
++ [ perl self.qmake ];
|
||||
|
||||
NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true;
|
||||
|
||||
outputs = args.outputs or [ "out" "dev" ];
|
||||
setOutputFlags = args.setOutputFlags or false;
|
||||
|
||||
setupHook = ../qtsubmodule-setup-hook.sh;
|
||||
|
||||
meta = {
|
||||
homepage = http://www.qt.io;
|
||||
description = "A cross-platform application framework for C++";
|
||||
license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
|
||||
maintainers = with maintainers; [ qknight ttuegel periklis ];
|
||||
platforms = platforms.unix;
|
||||
} // (args.meta or {});
|
||||
});
|
||||
qtModule =
|
||||
import ../qtModule.nix
|
||||
{ inherit mkDerivation perl; inherit (stdenv) lib; }
|
||||
{ inherit self srcs patches; };
|
||||
|
||||
addPackages = self: with self;
|
||||
let
|
||||
callPackage = self.newScope { inherit qtCompatVersion qtSubmodule srcs; };
|
||||
callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; };
|
||||
in {
|
||||
|
||||
inherit mkDerivation;
|
||||
|
||||
qtbase = callPackage ./qtbase {
|
||||
qtbase = callPackage ../modules/qtbase.nix {
|
||||
inherit (srcs.qtbase) src version;
|
||||
patches = patches.qtbase;
|
||||
inherit bison cups harfbuzz mesa;
|
||||
inherit dconf gtk3;
|
||||
withGtk3 = true; inherit dconf gtk3;
|
||||
inherit developerBuild decryptSslTraffic;
|
||||
};
|
||||
|
||||
qtcharts = callPackage ./qtcharts.nix {};
|
||||
qtconnectivity = callPackage ./qtconnectivity.nix {};
|
||||
qtdeclarative = callPackage ./qtdeclarative {};
|
||||
qtdoc = callPackage ./qtdoc.nix {};
|
||||
qtgraphicaleffects = callPackage ./qtgraphicaleffects.nix {};
|
||||
qtimageformats = callPackage ./qtimageformats.nix {};
|
||||
qtlocation = callPackage ./qtlocation.nix {};
|
||||
qtmacextras = callPackage ./qtmacextras.nix {};
|
||||
qtmultimedia = callPackage ./qtmultimedia.nix {
|
||||
qtcharts = callPackage ../modules/qtcharts.nix {};
|
||||
qtconnectivity = callPackage ../modules/qtconnectivity.nix {};
|
||||
qtdeclarative = callPackage ../modules/qtdeclarative.nix {};
|
||||
qtdoc = callPackage ../modules/qtdoc.nix {};
|
||||
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;
|
||||
};
|
||||
qtquick1 = null;
|
||||
qtquickcontrols = callPackage ./qtquickcontrols.nix {};
|
||||
qtquickcontrols2 = callPackage ./qtquickcontrols2.nix {};
|
||||
qtscript = callPackage ./qtscript {};
|
||||
qtsensors = callPackage ./qtsensors.nix {};
|
||||
qtserialport = callPackage ./qtserialport {};
|
||||
qtsvg = callPackage ./qtsvg.nix {};
|
||||
qttools = callPackage ./qttools {};
|
||||
qttranslations = callPackage ./qttranslations.nix {};
|
||||
qtwayland = callPackage ./qtwayland.nix {};
|
||||
qtwebchannel = callPackage ./qtwebchannel.nix {};
|
||||
qtwebengine = callPackage ./qtwebengine {};
|
||||
qtwebkit = callPackage ./qtwebkit {};
|
||||
qtwebsockets = callPackage ./qtwebsockets.nix {};
|
||||
qtx11extras = callPackage ./qtx11extras.nix {};
|
||||
qtxmlpatterns = callPackage ./qtxmlpatterns.nix {};
|
||||
qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {};
|
||||
qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {};
|
||||
qtscript = callPackage ../modules/qtscript.nix {};
|
||||
qtsensors = callPackage ../modules/qtsensors.nix {};
|
||||
qtserialport = callPackage ../modules/qtserialport.nix {};
|
||||
qtsvg = callPackage ../modules/qtsvg.nix {};
|
||||
qttools = callPackage ../modules/qttools.nix {};
|
||||
qttranslations = callPackage ../modules/qttranslations.nix {};
|
||||
qtwayland = callPackage ../modules/qtwayland.nix {};
|
||||
qtwebchannel = callPackage ../modules/qtwebchannel.nix {};
|
||||
qtwebengine = callPackage ../modules/qtwebengine.nix {};
|
||||
qtwebkit = callPackage ../modules/qtwebkit.nix {};
|
||||
qtwebsockets = callPackage ../modules/qtwebsockets.nix {};
|
||||
qtx11extras = callPackage ../modules/qtx11extras.nix {};
|
||||
qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {};
|
||||
|
||||
env = callPackage ../qt-env.nix {};
|
||||
full = env "qt-${qtbase.version}" ([
|
||||
@ -138,8 +110,12 @@ let
|
||||
|
||||
qmake = makeSetupHook {
|
||||
deps = [ self.qtbase.dev ];
|
||||
substitutions = { inherit (stdenv) isDarwin; };
|
||||
} ../qmake-hook.sh;
|
||||
substitutions = {
|
||||
inherit (stdenv) isDarwin;
|
||||
qtbase_dev = self.qtbase.dev;
|
||||
fix_qt_builtin_paths = ../hooks/fix-qt-builtin-paths.sh;
|
||||
};
|
||||
} ../hooks/qmake-hook.sh;
|
||||
};
|
||||
|
||||
self = makeScope newScope addPackages;
|
||||
|
@ -1,2 +1,2 @@
|
||||
WGET_ARGS=( https://download.qt.io/archive/qt/5.9/5.9.2/submodules/ \
|
||||
WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/ \
|
||||
-A '*.tar.xz' )
|
||||
|
1106
pkgs/development/libraries/qt-5/5.9/qtbase.patch
Normal file
1106
pkgs/development/libraries/qt-5/5.9/qtbase.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,359 +0,0 @@
|
||||
Index: qtbase-opensource-src-5.9.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
===================================================================
|
||||
--- qtbase-opensource-src-5.9.0.orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
+++ qtbase-opensource-src-5.9.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
@@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0)
|
||||
endif()
|
||||
!!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}.MAJOR_VERSION).$$eval(QT.$${MODULE}.MINOR_VERSION).$$eval(QT.$${MODULE}.PATCH_VERSION)")
|
||||
@@ -59,7 +35,10 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta
|
||||
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}\")
|
||||
+ set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
|
||||
+ if(NOT EXISTS \"${imported_location}\")
|
||||
+ set(imported_location \"@NIX_DEV@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
|
||||
+ endif()
|
||||
!!ELSE
|
||||
set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
|
||||
!!ENDIF
|
||||
@@ -74,19 +53,6 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta
|
||||
\"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
|
||||
)
|
||||
|
||||
-!!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
|
||||
- \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib}
|
||||
- )
|
||||
- endif()
|
||||
-!!ENDIF
|
||||
endmacro()
|
||||
!!ENDIF
|
||||
|
||||
@@ -95,24 +61,24 @@ 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}Qt$${CMAKE_MODULE_NAME}.framework\"
|
||||
- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\"
|
||||
+ \"@NIX_OUT@/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\"
|
||||
+ \"@NIX_OUT@/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.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}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\"
|
||||
- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\"
|
||||
+ \"@NIX_OUT@/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\"
|
||||
+ \"@NIX_OUT@/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.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}\")
|
||||
+ set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"@NIX_DEV@/$$CMAKE_INCLUDE_DIR\" \"@NIX_DEV@/$${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}\"
|
||||
+ \"@NIX_DEV@/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\"
|
||||
+ \"@NIX_DEV@/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\"
|
||||
)
|
||||
!!ELSE
|
||||
set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
|
||||
@@ -281,7 +247,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
|
||||
!!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}\" )
|
||||
+ if (EXISTS \"@NIX_OUT@/$${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
|
||||
@@ -289,13 +255,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
|
||||
!!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}\"
|
||||
+ \"@NIX_OUT@/$${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}\" )
|
||||
+ \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
|
||||
!!ELSE
|
||||
\"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
|
||||
!!ENDIF
|
||||
@@ -318,7 +284,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
|
||||
!!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}\" )
|
||||
+ if (EXISTS \"@NIX_DEV@/$${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
|
||||
@@ -326,13 +292,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
|
||||
!!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}\"
|
||||
+ \"@NIX_OUT@/$${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}\" )
|
||||
+ \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
|
||||
!!ELSE
|
||||
\"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
|
||||
!!ENDIF
|
||||
@@ -354,11 +320,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
|
||||
+ 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}
|
||||
Index: qtbase-opensource-src-5.9.0/src/gui/Qt5GuiConfigExtras.cmake.in
|
||||
===================================================================
|
||||
--- qtbase-opensource-src-5.9.0.orig/src/gui/Qt5GuiConfigExtras.cmake.in
|
||||
+++ qtbase-opensource-src-5.9.0/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_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_propert
|
||||
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_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_DEV@/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
|
||||
!!ELSE
|
||||
set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
|
||||
!!ENDIF
|
||||
Index: qtbase-opensource-src-5.9.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in
|
||||
===================================================================
|
||||
--- qtbase-opensource-src-5.9.0.orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in
|
||||
+++ qtbase-opensource-src-5.9.0/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_DEV@/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
|
||||
!!ELSE
|
||||
set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
|
||||
!!ENDIF
|
||||
Index: qtbase-opensource-src-5.9.0/src/corelib/Qt5CoreConfigExtras.cmake.in
|
||||
===================================================================
|
||||
--- qtbase-opensource-src-5.9.0.orig/src/corelib/Qt5CoreConfigExtras.cmake.in
|
||||
+++ qtbase-opensource-src-5.9.0/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_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_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_DEV@/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
|
||||
!!ELSE
|
||||
set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
|
||||
!!ENDIF
|
||||
@@ -133,7 +133,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_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
|
||||
!!ELSE
|
||||
set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
|
||||
!!ENDIF
|
||||
@@ -147,7 +147,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_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
|
||||
!!ELSE
|
||||
set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
|
||||
!!ENDIF
|
||||
Index: qtbase-opensource-src-5.9.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
|
||||
===================================================================
|
||||
--- qtbase-opensource-src-5.9.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
|
||||
+++ qtbase-opensource-src-5.9.0/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_DEV@/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
|
||||
!!ELSE
|
||||
set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
|
||||
!!ENDIF
|
||||
Index: qtbase-opensource-src-5.9.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
|
||||
===================================================================
|
||||
--- qtbase-opensource-src-5.9.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
|
||||
+++ qtbase-opensource-src-5.9.0/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_DEV@/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
|
||||
!!ELSE
|
||||
set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
|
||||
!!ENDIF
|
||||
Index: qtbase-opensource-src-5.9.0/src/dbus/Qt5DBusConfigExtras.cmake.in
|
||||
===================================================================
|
||||
--- qtbase-opensource-src-5.9.0.orig/src/dbus/Qt5DBusConfigExtras.cmake.in
|
||||
+++ qtbase-opensource-src-5.9.0/src/dbus/Qt5DBusConfigExtras.cmake.in
|
||||
@@ -3,7 +3,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\")
|
||||
+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
|
||||
!!ELSE
|
||||
set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
|
||||
!!ENDIF
|
||||
@@ -18,7 +18,7 @@ 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\")
|
||||
+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
|
||||
!!ELSE
|
||||
set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
|
||||
!!ENDIF
|
||||
Index: qtbase-opensource-src-5.9.0/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
|
||||
===================================================================
|
||||
--- qtbase-opensource-src-5.9.0.orig/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
|
||||
+++ qtbase-opensource-src-5.9.0/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 \"@NIX_BIN@/$${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 \"@NIX_BIN@/$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
|
||||
!!ENDIF
|
||||
|
||||
list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
|
||||
Index: qtbase-opensource-src-5.9.0/mkspecs/features/create_cmake.prf
|
||||
===================================================================
|
||||
--- qtbase-opensource-src-5.9.0.orig/mkspecs/features/create_cmake.prf
|
||||
+++ qtbase-opensource-src-5.9.0/mkspecs/features/create_cmake.prf
|
||||
@@ -136,28 +136,28 @@ contains(CONFIG, plugin) {
|
||||
|
||||
win32 {
|
||||
isEmpty(CMAKE_STATIC_TYPE) {
|
||||
- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.dll
|
||||
- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.dll
|
||||
+ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}.dll
|
||||
+ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}d.dll
|
||||
} else:mingw {
|
||||
- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}.a
|
||||
- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}d.a
|
||||
+ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}.a
|
||||
+ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}d.a
|
||||
} else { # MSVC static
|
||||
- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.lib
|
||||
- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.lib
|
||||
+ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}.lib
|
||||
+ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}d.lib
|
||||
}
|
||||
} else {
|
||||
mac {
|
||||
isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib
|
||||
else: CMAKE_PlUGIN_EXT = .a
|
||||
|
||||
- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
|
||||
- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
|
||||
+ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
|
||||
+ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
|
||||
} else {
|
||||
isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .so
|
||||
else: CMAKE_PlUGIN_EXT = .a
|
||||
|
||||
- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
|
||||
- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
|
||||
+ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
|
||||
+ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}
|
||||
}
|
||||
}
|
||||
cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in
|
@ -1,18 +0,0 @@
|
||||
Index: qtbase-opensource-src-5.9.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
|
||||
===================================================================
|
||||
--- qtbase-opensource-src-5.9.0.orig/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
|
||||
+++ qtbase-opensource-src-5.9.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
|
||||
@@ -265,12 +265,9 @@ void TableGenerator::initPossibleLocatio
|
||||
m_possibleLocations.reserve(7);
|
||||
if (qEnvironmentVariableIsSet("QTCOMPOSE"))
|
||||
m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE")));
|
||||
- m_possibleLocations.append(QStringLiteral("/usr/share/X11/locale"));
|
||||
- m_possibleLocations.append(QStringLiteral("/usr/local/share/X11/locale"));
|
||||
- m_possibleLocations.append(QStringLiteral("/usr/lib/X11/locale"));
|
||||
- m_possibleLocations.append(QStringLiteral("/usr/local/lib/X11/locale"));
|
||||
m_possibleLocations.append(QStringLiteral(X11_PREFIX "/share/X11/locale"));
|
||||
m_possibleLocations.append(QStringLiteral(X11_PREFIX "/lib/X11/locale"));
|
||||
+ m_possibleLocations.append(QLatin1String(NIXPKGS_QTCOMPOSE));
|
||||
}
|
||||
|
||||
QString TableGenerator::findComposeFile()
|
@ -1,36 +0,0 @@
|
||||
diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm
|
||||
index 341d3bc..3368234 100644
|
||||
--- a/src/plugins/bearer/corewlan/qcorewlanengine.mm
|
||||
+++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm
|
||||
@@ -287,7 +287,7 @@ void QScanThread::getUserConfigurations()
|
||||
QMacAutoReleasePool pool;
|
||||
userProfiles.clear();
|
||||
|
||||
- NSArray<NSString *> *wifiInterfaces = [CWWiFiClient interfaceNames];
|
||||
+ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames];
|
||||
for (NSString *ifName in wifiInterfaces) {
|
||||
|
||||
CWInterface *wifiInterface = [[CWWiFiClient sharedWiFiClient] interfaceWithName:ifName];
|
||||
@@ -602,7 +602,7 @@ void QCoreWlanEngine::doRequestUpdate()
|
||||
|
||||
QMacAutoReleasePool pool;
|
||||
|
||||
- NSArray<NSString *> *wifiInterfaces = [CWWiFiClient interfaceNames];
|
||||
+ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames];
|
||||
for (NSString *ifName in wifiInterfaces) {
|
||||
scanThread->interfaceName = QString::fromNSString(ifName);
|
||||
scanThread->start();
|
||||
QString TableGenerator::findComposeFile()
|
||||
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
|
||||
index 59b7637..b91139d 100644
|
||||
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
|
||||
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
|
||||
@@ -320,7 +320,7 @@ static void qt_closePopups()
|
||||
+ (void)applicationActivationChanged:(NSNotification*)notification
|
||||
{
|
||||
const id sender = self;
|
||||
- NSEnumerator<NSWindow*> *windowEnumerator = nullptr;
|
||||
+ NSEnumerator *windowEnumerator = nullptr;
|
||||
NSApplication *application = [NSApplication sharedApplication];
|
||||
|
||||
#if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12)
|
@ -1,3 +0,0 @@
|
||||
mkspecs-common-mac.patch
|
||||
mkspecs-features-mac.patch
|
||||
darwin-cf.patch
|
@ -1,19 +0,0 @@
|
||||
Index: qtbase-opensource-src-5.9.0/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
|
||||
===================================================================
|
||||
--- qtbase-opensource-src-5.9.0.orig/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
|
||||
+++ qtbase-opensource-src-5.9.0/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
|
||||
@@ -580,7 +580,14 @@ QFunctionPointer QGLXContext::getProcAdd
|
||||
#if QT_CONFIG(library)
|
||||
extern const QString qt_gl_library_name();
|
||||
// QLibrary lib(qt_gl_library_name());
|
||||
+ // Check system library paths first
|
||||
QLibrary lib(QLatin1String("GL"));
|
||||
+#ifdef NIXPKGS_MESA_GL
|
||||
+ if (!lib.load()) {
|
||||
+ // Fallback to Mesa driver
|
||||
+ lib.setFileName(QLatin1String(NIXPKGS_MESA_GL));
|
||||
+ }
|
||||
+#endif // NIXPKGS_MESA_GL
|
||||
glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB");
|
||||
#endif
|
||||
}
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user