public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #37693 from jtojnar/min-nix-two 

treewide: Re-add reverted Nix 2 syntax features
This commit is contained in:
Jan Tojnar 2018-08-30 18:50:22 +01:00 committed by GitHub
parent 11dab7bd4a 3ddead7085
commit 4caab41c1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 40 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/backup/deja-dup/default.nix
View File

@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ duplicity ]; propagatedUserEnvPkgs = [ duplicity ];
PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "lib/nautilus/extensions-3.0"; PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0";
postInstall = '' postInstall = ''
glib-compile-schemas $out/share/glib-2.0/schemas glib-compile-schemas $out/share/glib-2.0/schemas

15
pkgs/applications/misc/qpdfview/default.nix
View File

@ -21,11 +21,16 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
inherit (s) url sha256; inherit (s) url sha256;
}; };
qmakeFlags = [
# TODO: revert this once placeholder is supported "*.pro"
preConfigure = '' "TARGET_INSTALL_PATH=${placeholder "out"}/bin"
qmakeFlags="$qmakeFlags *.pro TARGET_INSTALL_PATH=$out/bin PLUGIN_INSTALL_PATH=$out/lib/qpdfview DATA_INSTALL_PATH=$out/share/qpdfview MANUAL_INSTALL_PATH=$out/share/man/man1 ICON_INSTALL_PATH=$out/share/icons/hicolor/scalable/apps LAUNCHER_INSTALL_PATH=$out/share/applications APPDATA_INSTALL_PATH=$out/share/appdata" "PLUGIN_INSTALL_PATH=${placeholder "out"}/lib/qpdfview"
''; "DATA_INSTALL_PATH=${placeholder "out"}/share/qpdfview"
"MANUAL_INSTALL_PATH=${placeholder "out"}/share/man/man1"
"ICON_INSTALL_PATH=${placeholder "out"}/share/icons/hicolor/scalable/apps"
"LAUNCHER_INSTALL_PATH=${placeholder "out"}/share/applications"
"APPDATA_INSTALL_PATH=${placeholder "out"}/share/appdata"
];
meta = { meta = {
inherit (s) version; inherit (s) version;

2
pkgs/desktops/gnome-3/apps/file-roller/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [ glib gtk json-glib libarchive file gnome3.defaultIconTheme libnotify nautilus ]; buildInputs = [ glib gtk json-glib libarchive file gnome3.defaultIconTheme libnotify nautilus ];
PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "lib/nautilus/extensions-3.0"; PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0";
postPatch = '' postPatch = ''
chmod +x postinstall.py # patchShebangs requires executable file chmod +x postinstall.py # patchShebangs requires executable file

2
pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
buildInputs = [ glib gtk3 gjs pango gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme libunistring ]; buildInputs = [ glib gtk3 gjs pango gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme libunistring ];
mesonFlags = [ mesonFlags = [
"-Ddbus_service_dir=share/dbus-1/services" "-Ddbus_service_dir=${placeholder "out"}/share/dbus-1/services"
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

4
pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
View File

@ -37,11 +37,9 @@ stdenv.mkDerivation rec {
"-DENABLE_VALA_BINDINGS=ON" "-DENABLE_VALA_BINDINGS=ON"
"-DENABLE_INTROSPECTION=ON" "-DENABLE_INTROSPECTION=ON"
"-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include"
]; ];
postPatch = ''
cmakeFlags="-DINCLUDE_INSTALL_DIR=$dev/include $cmakeFlags"
'';
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {

2
pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
View File

@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
]; ];
mesonFlags = [ mesonFlags = [
"-Dudev_dir=lib/udev" "-Dudev_dir=${placeholder "out"}/lib/udev"
]; ];
postPatch = '' postPatch = ''

7
pkgs/desktops/gnome-3/core/libgee/default.nix
View File

@ -6,6 +6,8 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
outputs = [ "out" "dev" ];
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "0c26x8gi3ivmhlbqcmiag4jwrkvcy28ld24j55nqr3jikb904a5v"; sha256 = "0c26x8gi3ivmhlbqcmiag4jwrkvcy28ld24j55nqr3jikb904a5v";
@ -13,11 +15,12 @@ stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
patches = [ ./fix_introspection_paths.patch ];
nativeBuildInputs = [ pkgconfig autoconf vala gobjectIntrospection ]; nativeBuildInputs = [ pkgconfig autoconf vala gobjectIntrospection ];
buildInputs = [ glib ]; buildInputs = [ glib ];
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0";
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0";
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {
packageName = pname; packageName = pname;

13
pkgs/desktops/gnome-3/core/libgee/fix_introspection_paths.patch
View File

@ -1,13 +0,0 @@
--- fix_introspection_paths.patch/configure 2014-01-07 17:43:53.521339338 +0000
+++ fix_introspection_paths.patch/configure-fix 2014-01-07 17:45:11.068635069 +0000
@@ -12085,8 +12085,8 @@
INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+ INTROSPECTION_GIRDIR="${datadir}/gir-1.0"
+ INTROSPECTION_TYPELIBDIR="${libdir}/girepository-1.0"
INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection

2
pkgs/desktops/gnome-3/core/totem/default.nix
View File

@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
''; '';
mesonFlags = [ mesonFlags = [
"-Dwith-nautilusdir=lib/nautilus/extensions-3.0" "-Dwith-nautilusdir=${placeholder "out"}/lib/nautilus/extensions-3.0"
# https://bugs.launchpad.net/ubuntu/+source/totem/+bug/1712021 # https://bugs.launchpad.net/ubuntu/+source/totem/+bug/1712021
# https://bugzilla.gnome.org/show_bug.cgi?id=784236 # https://bugzilla.gnome.org/show_bug.cgi?id=784236
# https://github.com/mesonbuild/meson/issues/1994 # https://github.com/mesonbuild/meson/issues/1994

2
pkgs/development/libraries/glib-networking/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
}) })
]; ];
PKG_CONFIG_GIO_2_0_GIOMODULEDIR = "lib/gio/modules"; PKG_CONFIG_GIO_2_0_GIOMODULEDIR = "${placeholder "out"}/lib/gio/modules";
postPatch = '' postPatch = ''
chmod +x meson_post_install.py # patchShebangs requires executable file chmod +x meson_post_install.py # patchShebangs requires executable file

6
pkgs/development/libraries/gvfs/default.nix
View File

@ -63,9 +63,9 @@ stdenv.mkDerivation rec {
# Uncomment when switching back to meson # Uncomment when switching back to meson
# mesonFlags = [ # mesonFlags = [
# "-Dgio_module_dir=lib/gio/modules" # "-Dgio_module_dir=${placeholder "out"}/lib/gio/modules"
# "-Dsystemduserunitdir=lib/systemd/user" # "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user"
# "-Ddbus_service_dir=share/dbus-1/services" # "-Ddbus_service_dir=${placeholder "out"}/share/dbus-1/services"
# "-Dtmpfilesdir=no" # "-Dtmpfilesdir=no"
# ] ++ stdenv.lib.optionals (!gnomeSupport) [ # ] ++ stdenv.lib.optionals (!gnomeSupport) [
# "-Dgcr=false" "-Dgoa=false" "-Dkeyring=false" "-Dhttp=false" # "-Dgcr=false" "-Dgoa=false" "-Dkeyring=false" "-Dhttp=false"

4
pkgs/development/libraries/libwnck/3.x.nix
View File

@ -19,8 +19,8 @@ in stdenv.mkDerivation rec{
nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ]; nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ];
propagatedBuildInputs = [ libX11 gtk3 ]; propagatedBuildInputs = [ libX11 gtk3 ];
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0"; PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0";
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0"; PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0";
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {

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

@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
"-Denable_gstreamer=true" "-Denable_gstreamer=true"
]; ];
PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "lib/systemd/user"; PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";
FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file

6
pkgs/development/libraries/science/math/sympow/default.nix
View File

@ -34,13 +34,11 @@ stdenv.mkDerivation rec {
makeWrapper "$out/share/sympow/sympow" "$out/bin/sympow" \ makeWrapper "$out/share/sympow/sympow" "$out/bin/sympow" \
--run 'export SYMPOW_LOCAL="$HOME/.local/share/sympow"' \ --run 'export SYMPOW_LOCAL="$HOME/.local/share/sympow"' \
--run 'if [ ! -d "$SYMPOW_LOCAL" ]; then --run 'if [ ! -d "$SYMPOW_LOCAL" ]; then
mkdir -p "$SYMPOW_LOCAL" mkdir -p "$SYMPOW_LOCAL"
cp -r @out@/share/sympow/* "$SYMPOW_LOCAL" cp -r ${placeholder "out"}/share/sympow/* "$SYMPOW_LOCAL"
chmod -R +xw "$SYMPOW_LOCAL" chmod -R +xw "$SYMPOW_LOCAL"
fi' \ fi' \
--run 'cd "$SYMPOW_LOCAL"' --run 'cd "$SYMPOW_LOCAL"'
substituteInPlace $out/bin/sympow --subst-var out
runHook postInstall runHook postInstall
''; '';

2
pkgs/development/libraries/spice-gtk/default.nix
View File

@ -52,7 +52,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook vala gobjectIntrospection ]; nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook vala gobjectIntrospection ];
PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "$(out)/share/polkit-1/actions"; PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions";
configureFlags = [ configureFlags = [
"--with-gtk3" "--with-gtk3"

4
pkgs/os-specific/linux/dbus-broker/default.nix
View File

@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
buildInputs = [ dbus glib linuxHeaders systemd ]; buildInputs = [ dbus glib linuxHeaders systemd ];
PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "lib/systemd/system"; PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system";
PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "lib/systemd/user"; PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";
postInstall = '' postInstall = ''
install -Dm644 ../README $out/share/doc/dbus-broker/README install -Dm644 ../README $out/share/doc/dbus-broker/README

2
pkgs/os-specific/linux/selinux-sandbox/default.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
substituteInPlace Makefile --replace "-m 4755" "-m 755" substituteInPlace Makefile --replace "-m 4755" "-m 755"
substituteInPlace sandboxX.sh \ substituteInPlace sandboxX.sh \
--replace "#!/bin/sh" "#!${bash}/bin/sh" \ --replace "#!/bin/sh" "#!${bash}/bin/sh" \
--replace "/usr/share/sandbox/start" "$out/share/sandbox/start" \ --replace "/usr/share/sandbox/start" "${placeholder "out"}/share/sandbox/start" \
--replace "/usr/bin/cut" "${coreutils}/bin/cut" \ --replace "/usr/bin/cut" "${coreutils}/bin/cut" \
--replace "/usr/bin/Xephyr" "${xorgserver}/bin/Xepyhr" \ --replace "/usr/bin/Xephyr" "${xorgserver}/bin/Xepyhr" \
--replace "secon" "${policycoreutils}/bin/secon" --replace "secon" "${policycoreutils}/bin/secon"

6
pkgs/tools/graphics/gmic/default.nix
View File

@ -32,16 +32,12 @@ in stdenv.mkDerivation rec {
"-DBUILD_LIB_STATIC=OFF" "-DBUILD_LIB_STATIC=OFF"
"-DBUILD_PLUGIN=${if withGimpPlugin then "ON" else "OFF"}" "-DBUILD_PLUGIN=${if withGimpPlugin then "ON" else "OFF"}"
"-DENABLE_DYNAMIC_LINKING=ON" "-DENABLE_DYNAMIC_LINKING=ON"
]; ] ++ stdenv.lib.optional withGimpPlugin "-DPLUGIN_INSTALL_PREFIX=${placeholder "gimpPlugin"}/${gimp.targetPluginDir}";
postPatch = '' postPatch = ''
cp ${CMakeLists} CMakeLists.txt cp ${CMakeLists} CMakeLists.txt
''; '';
preConfigure = stdenv.lib.optionalString withGimpPlugin ''
cmakeFlags="$cmakeFlags -DPLUGIN_INSTALL_PREFIX=$gimpPlugin/${gimp.targetPluginDir}"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "G'MIC is an open and full-featured framework for image processing"; description = "G'MIC is an open and full-featured framework for image processing";
homepage = http://gmic.eu/; homepage = http://gmic.eu/;

10
pkgs/tools/misc/colord/default.nix
View File

@ -29,11 +29,11 @@ stdenv.mkDerivation rec {
glib-compile-schemas $out/share/glib-2.0/schemas glib-compile-schemas $out/share/glib-2.0/schemas
''; '';
PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "lib/systemd/system"; PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system";
PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "lib/systemd/user"; PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";
PKG_CONFIG_SYSTEMD_TMPFILESDIR = "lib/tmpfiles.d"; PKG_CONFIG_SYSTEMD_TMPFILESDIR = "${placeholder "out"}/lib/tmpfiles.d";
PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR= "share/bash-completion/completions"; PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR= "${placeholder "out"}/share/bash-completion/completions";
PKG_CONFIG_UDEV_UDEVDIR = "lib/udev"; PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev";
postFixup = '' postFixup = ''
wrapProgram "$out/libexec/colord-session" \ wrapProgram "$out/libexec/colord-session" \