dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #141533 from jtojnar/gnome-prop-dev

Browse Source 
gnome: Try to reduce output closure
This commit is contained in:
Jan Tojnar 2021-10-14 00:09:42 +02:00 committed by GitHub
commit 09236e7b61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/orca/default.nix
View File

@ -65,7 +65,7 @@ buildPythonApplication rec {
gobject-introspection
];
propagatedBuildInputs = [
pythonPath = [
pygobject3
pyatspi
dbus-python

2
pkgs/data/themes/adwaita-qt/default.nix
View File

@ -14,6 +14,8 @@ mkDerivation rec {
pname = "adwaita-qt";
version = "1.4.0";
outputs = [ "out" "dev" ];
src = fetchFromGitHub {
owner = "FedoraQt";
repo = pname;

10
pkgs/desktops/gnome/apps/gnome-music/default.nix
View File

@ -79,13 +79,12 @@ python3.pkgs.buildPythonApplication rec {
gst-plugins-ugly
]);
propagatedBuildInputs = with python3.pkgs; [
pythonPath = with python3.pkgs; [
pycairo
dbus-python
pygobject3
];
postPatch = ''
for f in meson_post_conf.py meson_post_install.py; do
chmod +x $f
@ -93,6 +92,13 @@ python3.pkgs.buildPythonApplication rec {
done
'';
# Prevent double wrapping, let the Python wrapper use the args in preFixup.
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
doCheck = false;
# handle setup hooks better

2
pkgs/desktops/gnome/core/gnome-user-share/default.nix
View File

@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Dhttpd=${apacheHttpd.out}/bin/httpd"
"-Dmodules_path=${apacheHttpd.dev}/modules"
"-Dmodules_path=${apacheHttpd}/modules"
"-Dsystemduserunitdir=${placeholder "out"}/etc/systemd/user"
# In 3.34.0 it defaults to false but it is silently ignored and always installed.
# Let’s add it anyway in case they decide to make build respect the option in the future.

2
pkgs/desktops/gnome/core/nautilus/default.nix
View File

@ -36,6 +36,8 @@ stdenv.mkDerivation rec {
pname = "nautilus";
version = "41.0";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "+blBrcEEcAxn6kB2YiMV8fa3fc7BVMN/PUwLKDlQoeU=";

2
pkgs/desktops/gnome/misc/gnome-tweaks/default.nix
View File

@ -56,7 +56,7 @@ python3Packages.buildPythonApplication rec {
libsoup
];
propagatedBuildInputs = with python3Packages; [
pythonPath = with python3Packages; [
pygobject3
];

2
pkgs/desktops/mate/mate-user-share/default.nix
View File

@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--with-httpd=${apacheHttpd.out}/bin/httpd"
"--with-modules-path=${apacheHttpd.dev}/modules"
"--with-modules-path=${apacheHttpd}/modules"
"--with-cajadir=$(out)/lib/caja/extensions-2.0"
];

2
pkgs/development/libraries/dleyna-core/default.nix
View File

@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
pname = "dleyna-core";
version = "0.6.0";
outputs = [ "out" "dev" ];
setupHook = ./setup-hook.sh;
src = fetchFromGitHub {

1
pkgs/development/libraries/gstreamer/bad/default.nix
View File

@ -233,6 +233,7 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Dexamples=disabled" # requires many dependencies and probably not useful for our users
"-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
"-Dglib-asserts=disabled" # asserts should be disabled on stable releases
"-Davtp=disabled"
"-Ddts=disabled" # required `libdca` library not packaged in nixpkgs as of writing, and marked as "BIG FAT WARNING: libdca is still in early development"

1
pkgs/development/libraries/gstreamer/good/default.nix
View File

@ -120,6 +120,7 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Dexamples=disabled" # requires many dependencies and probably not useful for our users
"-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing
"-Dglib-asserts=disabled" # asserts should be disabled on stable releases
] ++ lib.optionals (!qt5Support) [
"-Dqt5=disabled"
] ++ lib.optionals (!gtkSupport) [

2
pkgs/development/libraries/libgxps/default.nix
View File

@ -6,6 +6,8 @@ stdenv.mkDerivation rec {
pname = "libgxps";
version = "0.3.2";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "bSeGclajXM+baSU+sqiKMrrKO5fV9O9/guNmf6Q1JRw=";

2
pkgs/development/python-modules/dogtail/default.nix
View File

@ -19,6 +19,8 @@ buildPythonPackage {
pname = "dogtail";
version = "0.9.11";
outputs = [ "out" "dev" ];
# https://gitlab.com/dogtail/dogtail/issues/1
# src = fetchPypi {
# inherit pname version;

10
pkgs/servers/http/apache-modules/mod_dnssd/default.nix
View File

@ -20,8 +20,18 @@ stdenv.mkDerivation rec {
}) ];
installPhase = ''
runHook preInstall
mkdir -p $out/modules
cp src/.libs/mod_dnssd.so $out/modules
runHook postInstall
'';
preFixup = ''
# TODO: Packages in non-standard directories not stripped.
# https://github.com/NixOS/nixpkgs/issues/141554
stripDebugList=modules
'';
meta = with lib; {