b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge #181133: staging-next 2022-07-11

Browse source
This commit is contained in:
Vladimír Čunát 2022-07-19 18:47:48 +02:00
parent a04460825e c698c07cfa
commit 2543ab976c
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
211 changed files with 2610 additions and 956 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/desktops/pipewire/daemon/minimal.conf.json
View file

@ -91,6 +91,7 @@
"adapter.auto-port-config": {
"mode": "dsp",
"monitor": false,
"control": false,
"position": "unknown"
}
}
@ -109,6 +110,7 @@
"adapter.auto-port-config": {
"mode": "dsp",
"monitor": false,
"control": false,
"position": "unknown"
}
}

3
pkgs/applications/audio/audacity/default.nix
View file

@ -167,6 +167,9 @@ in stdenv.mkDerivation rec {
"-DDISABLE_DYNAMIC_LOADING_FFMPEG=ON"
"-Daudacity_conan_enabled=Off"
"-Daudacity_use_ffmpeg=loaded"
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
"-DCMAKE_SKIP_BUILD_RPATH=ON"
];
doCheck = false; # Test fails

3
pkgs/applications/audio/in-formant/default.nix
View file

@ -35,6 +35,9 @@ stdenv.mkDerivation rec {
cp in-formant $out/bin
'';
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=ON" ];
meta = with lib; {
description = "A real-time pitch and formant tracking software";
homepage = "https://github.com/in-formant/in-formant";

2
pkgs/applications/audio/speech-denoiser/default.nix
View file

@ -27,7 +27,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkg-config meson ninja ];
buildInputs = [ lv2 rnnoise-nu ];
mesonFlags = ("--prefix=${placeholder "out"}/lib/lv2");
mesonFlags = [ "--prefix=${placeholder "out"}/lib/lv2" ];
postPatch = ''
substituteInPlace meson.build \

5
pkgs/applications/audio/tenacity/default.nix
View file

@ -138,6 +138,11 @@ stdenv.mkDerivation rec {
util-linux
];
cmakeFlags = [
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
"-DCMAKE_SKIP_BUILD_RPATH=ON"
];
meta = with lib; {
description = "Sound editor with graphical UI";
homepage = "https://tenacityaudio.org/";

5
pkgs/applications/emulators/resim/default.nix
View file

@ -17,5 +17,10 @@ stdenv.mkDerivation {
cp -v vc4emul/vc4emul $out/bin/vc4emul
'';
cmakeFlags = [
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
"-DCMAKE_SKIP_BUILD_RPATH=ON"
];
meta.license = lib.licenses.mit;
}

1
pkgs/applications/gis/qgis/unwrapped-ltr.nix
View file

@ -128,7 +128,6 @@ in mkDerivation rec {
'';
cmakeFlags = [
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DWITH_3D=True"
"-DWITH_PDAL=TRUE"
"-DPYQT5_SIP_DIR=${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings"

1
pkgs/applications/gis/qgis/unwrapped.nix
View file

@ -128,7 +128,6 @@ in mkDerivation rec {
'';
cmakeFlags = [
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DWITH_3D=True"
"-DWITH_PDAL=TRUE"
"-DPYQT5_SIP_DIR=${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings"

7
pkgs/applications/graphics/paraview/default.nix
View file

@ -44,13 +44,6 @@ in mkDerivation rec {
export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix}
'';
# During build, binaries are called that rely on freshly built
# libraries. These reside in build/lib, and are not found by
# default.
preBuild = ''
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib:$PWD/VTK/ThirdParty/vtkm/vtk-m/lib
'';
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DPARAVIEW_ENABLE_FFMPEG=ON"

4
pkgs/applications/kde/dolphin.nix
View file

@ -27,8 +27,4 @@ mkDerivation {
wayland qtwayland
];
outputs = [ "out" "dev" ];
# We need the RPATH for linking, because the `libkdeinit5_dolphin.so` links
# private against its dependencies and without the correct RPATH, these
# dependencies are not found.
cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ];
}

7
pkgs/applications/misc/audio/soxr/default.nix
View file

@ -16,13 +16,6 @@ stdenv.mkDerivation rec {
outputs = [ "out" "doc" ]; # headers are just two and very small
preConfigure =
if stdenv.isDarwin then ''
export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}"`pwd`/build/src
'' else ''
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}"`pwd`/build/src
'';
nativeBuildInputs = [ cmake ];
meta = with lib; {

2
pkgs/applications/misc/edgetx/default.nix
View file

@ -29,6 +29,8 @@ mkDerivation rec {
"-DGTEST_ROOT=${gtest.src}/googletest"
"-DQT_TRANSLATIONS_DIR=${qttranslations}/translations"
"-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util"
# file RPATH_CHANGE could not write new RPATH
"-DCMAKE_SKIP_BUILD_RPATH=ON"
];
meta = with lib; {

3
pkgs/applications/misc/opentx/default.nix
View file

@ -31,6 +31,9 @@ mkDerivation rec {
# XXX I would prefer to include these here, though we will need to file a bug upstream to get that changed.
#"-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util"
#"-DAVRDUDE_PATH=${avrdude}/bin/avrdude"
# file RPATH_CHANGE could not write new RPATH
"-DCMAKE_SKIP_BUILD_RPATH=ON"
];
meta = with lib; {

12
pkgs/applications/networking/instant-messengers/discord/openasar.nix
View file

@ -1,15 +1,5 @@
{ lib, stdenv, fetchFromGitHub, nodejs, bash, nodePackages, unzip }:
let
# OpenAsar fails with default unzip, throwing "lchmod (file attributes) error: Operation not supported"
unzipFix =
if stdenv.isLinux then
unzip.overrideAttrs (oldAttrs: {
buildFlags = oldAttrs.buildFlags ++ [ "LOCAL_UNZIP=-DNO_LCHMOD" ];
})
else
unzip;
in
stdenv.mkDerivation rec {
pname = "openasar";
version = "unstable-2022-06-27";
@ -24,7 +14,7 @@ stdenv.mkDerivation rec {
postPatch = ''
# Hardcode unzip path
substituteInPlace ./src/updater/moduleUpdater.js \
--replace \'unzip\' \'${unzipFix}/bin/unzip\'
--replace \'unzip\' \'${unzip}/bin/unzip\'
# Remove auto-update feature
echo "module.exports = async () => log('AsarUpdate', 'Removed');" > ./src/asarUpdate.js
'';

3
pkgs/applications/networking/instant-messengers/linphone/default.nix
View file

@ -83,6 +83,9 @@ mkDerivation rec {
cmakeFlags = [
"-DMINIZIP_INCLUDE_DIRS=${minizip2}/include"
"-DMINIZIP_LIBRARIES=minizip"
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
"-DCMAKE_SKIP_BUILD_RPATH=ON"
];
# The default install phase fails because the paths are somehow messed up in

4
pkgs/applications/networking/sniffers/wireshark/default.nix
View file

@ -59,10 +59,6 @@ in stdenv.mkDerivation {
sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt
'';
preBuild = ''
export LD_LIBRARY_PATH="$PWD/run"
'';
postInstall = ''
# to remove "cycle detected in the references"
mkdir -p $dev/lib/wireshark

2
pkgs/applications/office/PageEdit/default.nix
View file

@ -13,7 +13,7 @@ mkDerivation rec {
nativeBuildInputs = [ cmake qttranslations ];
propagatedBuildInputs = [ qtsvg qtwebengine ];
cmakeFlags = "-DINSTALL_BUNDLED_DICTS=0";
cmakeFlags = [ "-DINSTALL_BUNDLED_DICTS=0" ];
meta = with lib; {
description = "ePub XHTML Visual Editor";

2
pkgs/applications/office/gnucash/default.nix
View file

@ -154,8 +154,6 @@ stdenv.mkDerivation rec {
test-xml-pricedb \
test-xml-transaction \
test-xml2-is-file
export LD_LIBRARY_PATH="$PWD/lib:$PWD/lib/gnucash:$PWD/lib/gnucash/test:$PWD/lib/gnucash/test/future"
'';
preFixup = ''

4
pkgs/applications/radio/dsd/default.nix
View file

@ -22,10 +22,6 @@ stdenv.mkDerivation rec {
] ++ lib.optionals portaudioSupport [ portaudio ];
doCheck = true;
preCheck = ''
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD
export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD
'';
meta = with lib; {
description = "Digital Speech Decoder";

6
pkgs/applications/science/electronics/kicad/base.nix
View file

@ -75,7 +75,11 @@ stdenv.mkDerivation rec {
makeFlags = optionals (debug) [ "CFLAGS+=-Og" "CFLAGS+=-ggdb" ];
cmakeFlags = optionals (withScripting) [
cmakeFlags = [
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
"-DCMAKE_SKIP_BUILD_RPATH=ON"
]
++ optionals (withScripting) [
"-DKICAD_SCRIPTING_WXPYTHON=ON"
]
++ optionals (!withScripting) [

5
pkgs/applications/science/logic/btor2tools/default.nix
View file

@ -23,6 +23,11 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "lib" ];
cmakeFlags = [
# RPATH of binary /nix/store/.../bin/btorsim contains a forbidden reference to /build/
"-DCMAKE_SKIP_BUILD_RPATH=ON"
];
meta = with lib; {
description = "A generic parser and tool package for the BTOR2 format";
homepage = "https://github.com/Boolector/btor2tools";

3
pkgs/applications/science/logic/monosat/default.nix
View file

@ -47,6 +47,9 @@ let
"-DBUILD_STATIC=OFF"
"-DJAVA=${boolToCmake includeJava}"
"-DGPL=${boolToCmake includeGplCode}"
# file RPATH_CHANGE could not write new RPATH
"-DCMAKE_SKIP_BUILD_RPATH=ON"
];
postInstall = optionalString includeJava ''

1
pkgs/applications/science/machine-learning/shogun/default.nix
View file

@ -134,7 +134,6 @@ stdenv.mkDerivation rec {
"-DCMAKE_DISABLE_FIND_PACKAGE_Mosek=ON"
"-DCMAKE_DISABLE_FIND_PACKAGE_TFLogger=ON"
"-DCMAKE_DISABLE_FIND_PACKAGE_ViennaCL=ON"
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;TrainedModelSerialization'" # Sporadic segfault
"-DENABLE_TESTING=${enableIf doCheck}"
"-DDISABLE_META_INTEGRATION_TESTS=ON"

3
pkgs/applications/science/misc/simgrid/default.nix
View file

@ -65,6 +65,9 @@ stdenv.mkDerivation rec {
"-Denable_compile_warnings=off"
"-Denable_compile_optimizations=${optionOnOff optimize}"
"-Denable_lto=${optionOnOff optimize}"
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
"-DCMAKE_SKIP_BUILD_RPATH=ON"
];
makeFlags = optional debug "VERBOSE=1";

4
pkgs/applications/version-management/git-and-tools/git/default.nix
View file

@ -26,7 +26,7 @@ assert sendEmailSupport -> perlSupport;
assert svnSupport -> perlSupport;
let
version = "2.36.1";
version = "2.37.0";
svn = subversionClient.override { perlBindings = perlSupport; };
gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
in
@ -39,7 +39,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
sha256 = "0w43a35mhc2qf2gjkxjlnkf2lq8g0snf34iy5gqx2678yq7llpa0";
sha256 = "sha256-n3+hcRvQDE7D3eL+REB9wT8S5HcrXjxypY20wHSVQR8=";
};
outputs = [ "out" ] ++ lib.optional withManual "doc";

1
pkgs/applications/video/avidemux/default.nix
View file

@ -66,7 +66,6 @@ stdenv.mkDerivation rec {
cd "$sourceRoot"
patchPhase
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${libXext}/lib"
${stdenv.shell} bootStrap.bash \
--with-core \
${if withQT then "--with-qt" else "--without-qt"} \

5
pkgs/applications/video/ccextractor/default.nix
View file

@ -36,7 +36,10 @@ stdenv.mkDerivation rec {
++ lib.optional (!stdenv.isLinux) libiconv
++ lib.optionals enableOcr [ leptonica tesseract4 ffmpeg ];
cmakeFlags = lib.optionals enableOcr [ "-DWITH_OCR=on" "-DWITH_HARDSUBX=on" ];
cmakeFlags = [
# file RPATH_CHANGE could not write new RPATH:
"-DCMAKE_SKIP_BUILD_RPATH=ON"
] ++ lib.optionals enableOcr [ "-DWITH_OCR=on" "-DWITH_HARDSUBX=on" ];
postInstall = lib.optionalString enableOcr ''
wrapProgram "$out/bin/ccextractor" \

2
pkgs/applications/video/rtabmap/default.nix
View file

@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
];
# Disable warnings that are irrelevant to us as packagers
cmakeFlags = "-Wno-dev";
cmakeFlags = [ "-Wno-dev" ];
# We run one of the executables we build while the build is
# still running (and patchelf hasn't been invoked) which means

4
pkgs/data/icons/arc-icon-theme/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, gtk3, gnome, moka-icon-theme, gnome-icon-theme, hicolor-icon-theme }:
{ lib, stdenvNoCC, fetchFromGitHub, autoreconfHook, gtk3, gnome, moka-icon-theme, gnome-icon-theme, hicolor-icon-theme }:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "arc-icon-theme";
version = "2016-11-22";

4
pkgs/data/icons/beauty-line-icon-theme/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchzip, breeze-icons, gtk3, gnome-icon-theme, hicolor-icon-theme, mint-x-icons, pantheon }:
{ lib, stdenvNoCC, fetchzip, breeze-icons, gtk3, gnome-icon-theme, hicolor-icon-theme, mint-x-icons, pantheon }:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "BeautyLine";
version = "0.0.1";

4
pkgs/data/icons/bibata-cursors/default.nix
View file

@ -1,12 +1,12 @@
{ lib
, stdenv
, stdenvNoCC
, fetchFromGitHub
, fetchurl
, clickgen
, unzip
}:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "bibata-cursors";
version = "1.1.2";

4
pkgs/data/icons/bibata-cursors/extra.nix
View file

@ -1,12 +1,12 @@
{ lib
, stdenv
, stdenvNoCC
, fetchFromGitHub
, fetchurl
, clickgen
, unzip
}:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "bibata-extra-cursors";
version = "1.0.1";

4
pkgs/data/icons/bibata-cursors/translucent.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub }:
{ lib, stdenvNoCC, fetchFromGitHub }:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "bibata-cursors-translucent";
version = "1.1.1";

4
pkgs/data/icons/capitaine-cursors/default.nix
View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, makeFontsConf
{ lib, stdenvNoCC, fetchFromGitHub, fetchpatch, makeFontsConf
, inkscape, xcursorgen, bc }:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "capitaine-cursors";
version = "4";

4
pkgs/data/icons/comixcursors/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitLab, bc, librsvg, xcursorgen }:
{ lib, stdenvNoCC, fetchFromGitLab, bc, librsvg, xcursorgen }:
let
dimensions = {
@ -16,7 +16,7 @@ let
# meta.longDescription.)
map variantName product;
in
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "comixcursors";
version = "0.9.2";

4
pkgs/data/icons/faba-icon-theme/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, python3, gtk3, pantheon, gnome-icon-theme, hicolor-icon-theme }:
{ lib, stdenvNoCC, fetchFromGitHub, meson, ninja, python3, gtk3, pantheon, gnome-icon-theme, hicolor-icon-theme }:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "faba-icon-theme";
version = "4.3";

4
pkgs/data/icons/faba-mono-icons/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme, faba-icon-theme, gnome-icon-theme, hicolor-icon-theme }:
{ lib, stdenvNoCC, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme, faba-icon-theme, gnome-icon-theme, hicolor-icon-theme }:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "faba-mono-icons";
version = "2016-04-30";

4
pkgs/data/icons/gruvbox-dark-icons-gtk/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, gtk3, breeze-icons, gnome-icon-theme, hicolor-icon-theme }:
{ lib, stdenvNoCC, fetchFromGitHub, gtk3, breeze-icons, gnome-icon-theme, hicolor-icon-theme }:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "gruvbox-dark-icons-gtk";
version = "1.0.0";

4
pkgs/data/icons/hicolor-icon-theme/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl }:
{ lib, stdenvNoCC, fetchurl }:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "hicolor-icon-theme";
version = "0.17";

4
pkgs/data/icons/iconpack-jade/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }:
{ lib, stdenvNoCC, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "iconpack-jade";
version = "1.25";

4
pkgs/data/icons/iconpack-obsidian/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, gtk3, gnome-icon-theme, mint-x-icons, hicolor-icon-theme }:
{ lib, stdenvNoCC, fetchFromGitHub, gtk3, gnome-icon-theme, mint-x-icons, hicolor-icon-theme }:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "iconpack-obsidian";
version = "4.15";

4
pkgs/data/icons/iso-flags/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv
{ lib, stdenvNoCC
, fetchFromGitHub
, perl
, inkscape
@ -6,7 +6,7 @@
, targets ? [ "all" ]
}:
stdenv.mkDerivation {
stdenvNoCC.mkDerivation {
pname = "iso-flags";
version = "unstable-18012020";

4
pkgs/data/icons/kora-icon-theme/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub , gtk3, adwaita-icon-theme, breeze-icons, hicolor-icon-theme }:
{ lib, stdenvNoCC, fetchFromGitHub , gtk3, adwaita-icon-theme, breeze-icons, hicolor-icon-theme }:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "kora-icon-theme";
version = "1.5.2";

4
pkgs/data/icons/la-capitaine-icon-theme/default.nix
View file

@ -1,5 +1,5 @@
{ lib
, stdenv
, stdenvNoCC
, fetchFromGitHub
, breeze-icons
, elementary-icon-theme
@ -7,7 +7,7 @@
, hicolor-icon-theme
}:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "la-capitaine-icon-theme";
version = "0.6.2";

4
pkgs/data/icons/moka-icon-theme/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, faba-icon-theme, hicolor-icon-theme, jdupes }:
{ lib, stdenvNoCC, fetchFromGitHub, meson, ninja, gtk3, python3, faba-icon-theme, hicolor-icon-theme, jdupes }:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "moka-icon-theme";
version = "unstable-2019-05-29";

4
pkgs/data/icons/nordzy-cursor-theme/default.nix
View file

@ -1,9 +1,9 @@
{ stdenv
{ stdenvNoCC
, fetchFromGitHub
, lib
}:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "nordzy-cursor-theme";
version = "0.1.0";

4
pkgs/data/icons/numix-cursor-theme/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, inkscape, xcursorgen }:
{ lib, stdenvNoCC, fetchFromGitHub, inkscape, xcursorgen }:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "numix-cursor-theme";
version = "1.2";

4
pkgs/data/icons/numix-icon-theme-circle/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, gtk3, numix-icon-theme, hicolor-icon-theme, gitUpdater }:
{ lib, stdenvNoCC, fetchFromGitHub, gtk3, numix-icon-theme, hicolor-icon-theme, gitUpdater }:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "numix-icon-theme-circle";
version = "22.07.11";

4
pkgs/data/icons/numix-icon-theme-square/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, gtk3, numix-icon-theme, hicolor-icon-theme, gitUpdater }:
{ lib, stdenvNoCC, fetchFromGitHub, gtk3, numix-icon-theme, hicolor-icon-theme, gitUpdater }:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "numix-icon-theme-square";
version = "22.07.11";

4
pkgs/data/icons/numix-icon-theme/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }:
{ lib, stdenvNoCC, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "numix-icon-theme";
version = "21.10.31";

4
pkgs/data/icons/oranchelo-icon-theme/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, gtk3, plasma5Packages, hicolor-icon-theme }:
{ lib, stdenvNoCC, fetchFromGitHub, gtk3, plasma5Packages, hicolor-icon-theme }:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "oranchelo-icon-theme";
version = "0.8.0.1";

4
pkgs/data/icons/paper-icon-theme/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, gtk3, gnome, gnome-icon-theme, hicolor-icon-theme, jdupes }:
{ lib, stdenvNoCC, fetchFromGitHub, meson, ninja, gtk3, gnome, gnome-icon-theme, hicolor-icon-theme, jdupes }:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "paper-icon-theme";
version = "unstable-2020-03-12";

4
pkgs/data/icons/papirus-icon-theme/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, fetchurl, gtk3, pantheon, breeze-icons, gnome-icon-theme, hicolor-icon-theme, papirus-folders, color ? null }:
{ lib, stdenvNoCC, fetchFromGitHub, fetchurl, gtk3, pantheon, breeze-icons, gnome-icon-theme, hicolor-icon-theme, papirus-folders, color ? null }:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "papirus-icon-theme";
version = "20220710";

4
pkgs/data/icons/pop-icon-theme/default.nix
View file

@ -1,5 +1,5 @@
{ lib
, stdenv
, stdenvNoCC
, fetchFromGitHub
, meson
, ninja
@ -8,7 +8,7 @@
, hicolor-icon-theme
}:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "pop-icon-theme";
version = "2021-11-17";

4
pkgs/data/icons/vanilla-dmz/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv
{ stdenvNoCC
, lib
, fetchzip
, xorg
, hicolor-icon-theme
}:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "vanilla-dmz";
version = "0.4.5";

4
pkgs/data/icons/vimix-icon-theme/default.nix
View file

@ -1,5 +1,5 @@
{ lib
, stdenv
, stdenvNoCC
, fetchFromGitHub
, gtk3
, hicolor-icon-theme
@ -13,7 +13,7 @@ let
in
lib.checkListOfEnum "${pname}: color variants" [ "standard" "Amethyst" "Beryl" "Doder" "Ruby" "Black" "White" ] colorVariants
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
inherit pname;
version = "2021-11-09";

10
pkgs/data/misc/shared-mime-info/default.nix
View file

@ -13,17 +13,17 @@
}:
stdenv.mkDerivation rec {
pname = "shared-mime-info-unstable";
version = "2021-12-03";
pname = "shared-mime-info";
version = "2.2";
outputs = [ "out" "dev" ];
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "xdg";
repo = "shared-mime-info";
rev = "5a406b06792e26a83c7346b3c2443c0bd8d4cdb2";
sha256 = "1v7dx7mr0m4lcff1aasg9gxn280zn0ffn6fjg9xc44pnllg01n6s";
repo = pname;
rev = version;
sha256 = "sha256-QrRe/DcjpTMejHXDSOLbjpJywod8qIjP6/leTZ21rhE=";
};
nativeBuildInputs = [

1
pkgs/desktops/gnome/core/evolution-data-server/default.nix
View file

@ -119,7 +119,6 @@ stdenv.mkDerivation rec {
"-DENABLE_UOA=OFF"
"-DENABLE_VALA_BINDINGS=ON"
"-DENABLE_INTROSPECTION=ON"
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include"
"-DWITH_PHONENUMBER=ON"
"-DWITH_GWEATHER4=ON"

1
pkgs/desktops/plasma-5/kwin/default.nix
View file

@ -61,7 +61,6 @@ mkDerivation {
CXXFLAGS = [
''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"''
];
cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ];
postInstall = ''
# Some package(s) refer to these service types by the wrong name.
# I would prefer to patch those packages, but I cannot find them!

3
pkgs/development/compilers/gcc/common/configure-flags.nix
View file

@ -222,9 +222,6 @@ let
++ lib.optionals (langD) [
"--with-target-system-zlib=yes"
]
# Make -fcommon default on gcc10
# TODO: fix all packages (probably 100+) and remove that
++ lib.optional (version >= "10.1.0") "--with-specs=%{!fno-common:%{!fcommon:-fcommon}}"
;
in configureFlags

6
pkgs/development/compilers/halide/default.nix
View file

@ -32,12 +32,6 @@ llvmPackages.stdenv.mkDerivation rec {
cmakeFlags = [ "-DWARNINGS_AS_ERRORS=OFF" "-DWITH_PYTHON_BINDINGS=OFF" ];
# To handle the lack of 'local' RPATH; required, as they call one of
# their built binaries requiring their libs, in the build process.
preBuild = ''
export LD_LIBRARY_PATH="$(pwd)/src''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
'';
# Note: only openblas and not atlas part of this Nix expression
# see pkgs/development/libraries/science/math/liblapack/3.5.0.nix
# to get a hint howto setup atlas instead of openblas

6
pkgs/development/compilers/llvm/10/llvm/default.nix
View file

@ -244,12 +244,6 @@ in stdenv.mkDerivation (rec {
ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
''
+ optionalString enableSharedLibraries ''
mkdir -p $dev/lib
mv $lib/lib/*.a $dev/lib
sed -i -E "s|$lib/lib/(.*)\.a|$dev/lib/\1\.a|" \
"$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake"
''
+ optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native
'';

12
pkgs/development/compilers/llvm/11/clang/default.nix
View file

@ -50,18 +50,6 @@ let
./purity.patch
# https://reviews.llvm.org/D51899
./gnu-install-dirs.patch
# Revert: [Driver] Default to -fno-common for all targets
# https://reviews.llvm.org/D75056
#
# Maintains compatibility with packages that haven't been fixed yet, and
# matches gcc10's configuration in nixpkgs.
(fetchpatch {
revert = true;
url = "https://github.com/llvm/llvm-project/commit/0a9fc9233e172601e26381810d093e02ef410f65.diff";
stripLen = 1;
excludes = [ "docs/*" "test/*" ];
sha256 = "0gxgmi0qbm89mq911dahallhi8m6wa9vpklklqmxafx4rplrr8ph";
})
(substituteAll {
src = ../../clang-11-12-LLVMgold-path.patch;
libllvmLibdir = "${libllvm.lib}/lib";

6
pkgs/development/compilers/llvm/11/llvm/default.nix
View file

@ -256,12 +256,6 @@ in stdenv.mkDerivation (rec {
ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
''
+ optionalString enableSharedLibraries ''
mkdir -p $dev/lib
mv $lib/lib/*.a $dev/lib
sed -i -E "s|$lib/lib/(.*)\.a|$dev/lib/\1\.a|" \
"$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake"
''
+ optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native
'';

6
pkgs/development/compilers/llvm/12/llvm/default.nix
View file

@ -244,12 +244,6 @@ in stdenv.mkDerivation (rec {
ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
''
+ optionalString enableSharedLibraries ''
mkdir -p $dev/lib
mv $lib/lib/*.a $dev/lib
sed -i -E "s|$lib/lib/(.*)\.a|$dev/lib/\1\.a|" \
"$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake"
''
+ optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native
'';

6
pkgs/development/compilers/llvm/13/llvm/default.nix
View file

@ -206,12 +206,6 @@ in stdenv.mkDerivation (rec {
ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
''
+ optionalString enableSharedLibraries ''
mkdir -p $dev/lib
mv $lib/lib/*.a $dev/lib
sed -i -E "s|$lib/lib/(.*)\.a|$dev/lib/\1\.a|" \
"$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake"
''
+ optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native
'';

4
pkgs/development/compilers/llvm/14/default.nix
View file

@ -18,7 +18,7 @@
}:
let
release_version = "14.0.1";
release_version = "14.0.6";
candidate = ""; # empty or "rcN"
dash-candidate = lib.optionalString (candidate != "") "-${candidate}";
rev = ""; # When using a Git commit
@ -30,7 +30,7 @@ let
owner = "llvm";
repo = "llvm-project";
rev = if rev != "" then rev else "llvmorg-${version}";
sha256 = "14wgrjwj02ivlwb1zgidacspkkcfpsqjmgd7r838qmwpk56yxl9f";
sha256 = "sha256-vffu4HilvYwtzwgq+NlS26m65DGbp6OSSne2aje1yJE=";
};
llvm_meta = {

6
pkgs/development/compilers/llvm/14/llvm/default.nix
View file

@ -203,12 +203,6 @@ in stdenv.mkDerivation (rec {
ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
''
+ optionalString enableSharedLibraries ''
mkdir -p $dev/lib
mv $lib/lib/*.a $dev/lib
sed -i -E "s|$lib/lib/(.*)\.a|$dev/lib/\1\.a|" \
"$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake"
''
+ optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native
'';

6
pkgs/development/compilers/llvm/5/llvm/default.nix
View file

@ -222,12 +222,6 @@ stdenv.mkDerivation (rec {
ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib
'') versionSuffixes}
''
+ optionalString enableSharedLibraries ''
mkdir -p $dev/lib
mv $lib/lib/*.a $dev/lib
sed -i -E "s|$lib/lib/(.*)\.a|$dev/lib/\1\.a|" \
"$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake"
''
+ optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native
'';

6
pkgs/development/compilers/llvm/6/llvm/default.nix
View file

@ -215,12 +215,6 @@ stdenv.mkDerivation (rec {
ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib
'') versionSuffixes}
''
+ optionalString enableSharedLibraries ''
mkdir -p $dev/lib
mv $lib/lib/*.a $dev/lib
sed -i -E "s|$lib/lib/(.*)\.a|$dev/lib/\1\.a|" \
"$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake"
''
+ optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native
'';

6
pkgs/development/compilers/llvm/7/llvm/default.nix
View file

@ -234,12 +234,6 @@ in stdenv.mkDerivation (rec {
ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib
'') versionSuffixes}
''
+ optionalString enableSharedLibraries ''
mkdir -p $dev/lib
mv $lib/lib/*.a $dev/lib
sed -i -E "s|$lib/lib/(.*)\.a|$dev/lib/\1\.a|" \
"$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake"
''
+ optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native
'';

6
pkgs/development/compilers/llvm/8/llvm/default.nix
View file

@ -226,12 +226,6 @@ in stdenv.mkDerivation (rec {
ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
''
+ optionalString enableSharedLibraries ''
mkdir -p $dev/lib
mv $lib/lib/*.a $dev/lib
sed -i -E "s|$lib/lib/(.*)\.a|$dev/lib/\1\.a|" \
"$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake"
''
+ optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native
'';

6
pkgs/development/compilers/llvm/9/llvm/default.nix
View file

@ -241,12 +241,6 @@ in stdenv.mkDerivation (rec {
ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
''
+ optionalString enableSharedLibraries ''
mkdir -p $dev/lib
mv $lib/lib/*.a $dev/lib
sed -i -E "s|$lib/lib/(.*)\.a|$dev/lib/\1\.a|" \
"$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake"
''
+ optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native
'';

6
pkgs/development/compilers/llvm/git/llvm/default.nix
View file

@ -200,12 +200,6 @@ in stdenv.mkDerivation (rec {
ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
''
+ optionalString enableSharedLibraries ''
mkdir -p $dev/lib
mv $lib/lib/*.a $dev/lib
sed -i -E "s|$lib/lib/(.*)\.a|$dev/lib/\1\.a|" \
"$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake"
''
+ optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native
'';

32
pkgs/development/compilers/rust/1_61.nix → pkgs/development/compilers/rust/1_62.nix
View file

@ -20,8 +20,8 @@
} @ args:
import ./default.nix {
rustcVersion = "1.61.0";
rustcSha256 = "1vfs05hkf9ilk19b2vahqn8l6k17pl9nc1ky9kgspaascx8l62xd";
rustcVersion = "1.62.0";
rustcSha256 = "09y06qmh7ihi9kgimpp3h4nj3cmgc1zypqyaba10dlk4kf07h23x";
llvmSharedForBuild = pkgsBuildBuild.llvmPackages_14.libllvm.override { enableSharedLibraries = true; };
llvmSharedForHost = pkgsBuildHost.llvmPackages_14.libllvm.override { enableSharedLibraries = true; };
@ -37,25 +37,25 @@ import ./default.nix {
# Note: the version MUST be one version prior to the version we're
# building
bootstrapVersion = "1.60.0";
bootstrapVersion = "1.61.0";
# fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
bootstrapHashes = {
i686-unknown-linux-gnu = "2a635269dc9ad8f7bbdf168cdf120e1ec803d36adc832c0804f38e0acc3e2357";
x86_64-unknown-linux-gnu = "b8a4c3959367d053825e31f90a5eb86418eb0d80cacda52bfa80b078e18150d5";
x86_64-unknown-linux-musl = "f0feefcb1985c5c894ad9b0f44e6f09900b31c0eb5f49827da9f37d332a63894";
arm-unknown-linux-gnueabihf = "161b2b97d4512080350cc6656b0765ebae870335e86c2896bed08b32c66fbdf4";
armv7-unknown-linux-gnueabihf = "f2d76e9458949675bab8fcae44f600d30d91f62bf93c127b6b1fe3130e67d5d9";
aarch64-unknown-linux-gnu = "99c419c2f35d4324446481c39402c7baecd7a8baed7edca9f8d6bbd33c05550c";
aarch64-unknown-linux-musl = "fe7e9bad8beea84973f7ffa39879929de4ac8afad872650fb0af6b068f05faa6";
x86_64-apple-darwin = "0b10dc45cddc4d2355e38cac86d71a504327cb41d41d702d4050b9847ad4258c";
aarch64-apple-darwin = "b532672c278c25683ca63d78e82bae829eea1a32308e844954fb66cfe34ad222";
powerpc64le-unknown-linux-gnu = "80125e90285b214c2b1f56ab86a09c8509aa17aec9d7127960a86a7008e8f7de";
riscv64gc-unknown-linux-gnu = "9cc7c6804bcbbecb9c35232035fc488dbcc8487606cc6be3da553cc446bf0fcd";
mips64el-unknown-linux-gnuabi64 = "d413681c22511259f7cd15414a00050cf151d46ac0f9282e765faeb86688deac";
i686-unknown-linux-gnu = "b15eb0ad44b7253e0b5b1a8cd285feb10e9fb0402840dba9a13112c3349a4b39";
x86_64-unknown-linux-gnu = "066b324239d30787ce64142d7e04912f2e1850c07db3b2354d8654e02ff8b23a";
x86_64-unknown-linux-musl = "0904f6b769ae28c259e0e25a41e99290a4ae2a36bca63ae153790b2ebbc427bf";
arm-unknown-linux-gnueabihf = "cc32705cd1b583aaac74e6663f71392131dc0355a0f484cb56f0378b71ea7ebc";
armv7-unknown-linux-gnueabihf = "2782ec75ea4abb402513e2e57becc6c14e67b492d57228cddedef6db0853b165";
aarch64-unknown-linux-gnu = "261cd47bc3c98c9f97b601d1ad2a7d9b33c9ea63c9a351119c2f6d4e82f5d436";
aarch64-unknown-linux-musl = "feb79985cb161a10b252236852df8db3bf3593c78905b84c7e94cd4454327e47";
x86_64-apple-darwin = "d851f1a473926a5d8f111ed08002047a5dc4ad944a5b7f8d5d2f1f266b51e66a";
aarch64-apple-darwin = "2dbafd13d007543aada47179fa273f9a3865f27e0a07bd69be61801232a0819e";
powerpc64le-unknown-linux-gnu = "6d5cd579b68a2adc20384406c69a92beaaf4941056e126ff0ed1ec2f3a4e721f";
riscv64gc-unknown-linux-gnu = "3d0f3b1a8522e09fffdf920a061794ac3107410eb1fe8f5d62a7aae3c6dcb81e";
mips64el-unknown-linux-gnuabi64 = "6ed5b6492e68f45488108abd06dbcd4b89c46cdbd4715331bb11e88f18500815";
};
selectRustPackage = pkgs: pkgs.rust_1_61;
selectRustPackage = pkgs: pkgs.rust_1_62;
rustcPatches = [
];

6
pkgs/development/compilers/seexpr/default.nix
View file

@ -22,7 +22,11 @@ stdenv.mkDerivation rec {
sha256 = "sha256-r6mgyb/FGz4KYZOgLDgmIqjO+PSmneD3KUWjymZXtEk=";
};
cmakeFlags = [ "-DENABLE_SSE4=OFF" ];
cmakeFlags = [
"-DENABLE_SSE4=OFF"
# file RPATH_CHANGE could not write new RPATH
"-DCMAKE_SKIP_BUILD_RPATH=ON"
];
nativeBuildInputs = [ cmake ];
buildInputs = [ libGLU libpng zlib qt4 python3Packages.pyqt4 python3Packages.boost bison flex ];

6
pkgs/development/compilers/solc/default.nix
View file

@ -90,12 +90,6 @@ let
doCheck = false;
checkPhase = ''
while IFS= read -r -d ''' dir
do
LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$(pwd)/$dir
export LD_LIBRARY_PATH
done < <(find . -type d -print0)
pushd ..
# IPC tests need aleth avaliable, so we disable it
sed -i "s/IPC_ENABLED=true/IPC_ENABLED=false\nIPC_FLAGS=\"--no-ipc\"/" ./scripts/tests.sh

2
pkgs/development/compilers/spirv-llvm-translator/default.nix
View file

@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
"-DLLVM_DIR=${llvm_11.dev}"
"-DBUILD_SHARED_LIBS=YES"
"-DLLVM_SPIRV_BUILD_EXTERNAL=YES"
# RPATH of binary /nix/store/.../bin/llvm-spirv contains a forbidden reference to /build/
"-DCMAKE_SKIP_BUILD_RPATH=ON"
];
# FIXME: CMake tries to run "/llvm-lit" which of course doesn't exist

5
pkgs/development/compilers/zig/default.nix
View file

@ -36,6 +36,11 @@ stdenv.mkDerivation rec {
export HOME=$TMPDIR;
'';
cmakeFlags = [
# file RPATH_CHANGE could not write new RPATH
"-DCMAKE_SKIP_BUILD_RPATH=ON"
];
doCheck = true;
checkPhase = ''
runHook preCheck

5
pkgs/development/embedded/xc3sprog/default.nix
View file

@ -16,6 +16,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ libusb-compat-0_1 libftdi ];
cmakeFlags = [
# file RPATH_CHANGE could not write new RPATH
"-DCMAKE_SKIP_BUILD_RPATH=ON"
];
meta = with lib; {
description = "Command-line tools for programming FPGAs, microcontrollers and PROMs via JTAG";
homepage = "http://xc3sprog.sourceforge.net/";

4
pkgs/development/libraries/a52dec/default.nix
View file

@ -1,4 +1,4 @@
{lib, stdenv, fetchurl}:
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "a52dec";
@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
configureFlags = [
"--enable-shared"
# Define inline as __attribute__ ((__always_inline__))
"ac_cv_c_inline=yes"
];
makeFlags = [

1
pkgs/development/libraries/arrow-cpp/default.nix
View file

@ -204,7 +204,6 @@ stdenv.mkDerivation rec {
] ++ lib.optionals (!enableShared) [
"-DARROW_TEST_LINKAGE=static"
] ++ lib.optionals stdenv.isDarwin [
"-DCMAKE_SKIP_BUILD_RPATH=OFF" # needed for tests
"-DCMAKE_INSTALL_RPATH=@loader_path/../lib" # needed for tools executables
] ++ lib.optional (!stdenv.isx86_64) "-DARROW_USE_SIMD=OFF"
++ lib.optional enableS3 "-DAWSSDK_CORE_HEADER_FILE=${aws-sdk-cpp}/include/aws/core/Aws.h";

3
pkgs/development/libraries/audio/libkeyfinder/default.nix
View file

@ -11,9 +11,6 @@ stdenv.mkDerivation rec {
sha256 = "sha256-7w/Wc9ncLinbnM2q3yv5DBtFoJFAM2e9xAUTsqvE9mg=";
};
# needed for finding libkeyfinder.so to link it into keyfinder-tests executable
cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ];
nativeBuildInputs = [ cmake ];
buildInputs = [ fftw ];

4
pkgs/development/libraries/audio/mbelib/default.nix
View file

@ -14,10 +14,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
doCheck = true;
preCheck = ''
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD
export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD
'';
meta = with lib; {
description = "P25 Phase 1 and ProVoice vocoder";

1
pkgs/development/libraries/aws-c-auth/default.nix
View file

@ -39,7 +39,6 @@ stdenv.mkDerivation rec {
];
cmakeFlags = [
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DBUILD_SHARED_LIBS=ON"
];

1
pkgs/development/libraries/aws-c-common/default.nix
View file

@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
"-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests
] ++ lib.optionals stdenv.hostPlatform.isRiscV [
"-DCMAKE_C_FLAGS=-fasynchronous-unwind-tables"
];

1
pkgs/development/libraries/aws-c-compression/default.nix
View file

@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
];
cmakeFlags = [
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DBUILD_SHARED_LIBS=ON"
];

1
pkgs/development/libraries/aws-c-http/default.nix
View file

@ -32,7 +32,6 @@ stdenv.mkDerivation rec {
];
cmakeFlags = [
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DBUILD_SHARED_LIBS=ON"
];

1
pkgs/development/libraries/aws-c-mqtt/default.nix
View file

@ -34,7 +34,6 @@ stdenv.mkDerivation rec {
];
cmakeFlags = [
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DBUILD_SHARED_LIBS=ON"
];

1
pkgs/development/libraries/aws-c-s3/default.nix
View file

@ -38,7 +38,6 @@ stdenv.mkDerivation rec {
];
cmakeFlags = [
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DBUILD_SHARED_LIBS=ON"
];

1
pkgs/development/libraries/aws-c-sdkutils/default.nix
View file

@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
];
cmakeFlags = [
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DBUILD_SHARED_LIBS=ON"
];

1
pkgs/development/libraries/aws-crt-cpp/default.nix
View file

@ -67,7 +67,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DBUILD_DEPS=OFF"
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
"-DBUILD_SHARED_LIBS=ON"
];

1
pkgs/development/libraries/aws-sdk-cpp/default.nix
View file

@ -85,7 +85,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DBUILD_DEPS=OFF"
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
] ++ lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0"
++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
"-DENABLE_TESTING=OFF"

4
pkgs/development/libraries/caf/default.nix
View file

@ -21,10 +21,6 @@ stdenv.mkDerivation rec {
doCheck = true;
checkTarget = "test";
preCheck = ''
export LD_LIBRARY_PATH=$PWD/libcaf_core:$PWD/libcaf_io
export DYLD_LIBRARY_PATH=$PWD/libcaf_core:$PWD/libcaf_io
'';
meta = with lib; {
description = "An open source implementation of the actor model in C++";

9
pkgs/development/libraries/cairo/default.nix
View file

@ -52,9 +52,16 @@ in stdenv.mkDerivation rec {
url = "https://github.com/freedesktop/cairo/commit/78266cc8c0f7a595cfe8f3b694bfb9bcc3700b38.patch";
sha256 = "048nzfz7rkgqb9xs0dfs56qdw7ckkxr87nbj3p0qziqdq4nb6wki";
})
] ++ optionals stdenv.hostPlatform.isDarwin [
# Workaround https://gitlab.freedesktop.org/cairo/cairo/-/issues/121
./skip-configure-stderr-check.patch
# Fixes cairo crash on macOS Big Sur
# Upstream PR: https://gitlab.freedesktop.org/cairo/cairo/-/issues/420
(fetchpatch {
url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/e22d7212acb454daccc088619ee147af03883974.diff";
sha256 = "sha256-8G98nsPz3MLEWPDX9F0jKgXC4hC4NNdFQLSpmW3ay2s=";
})
];
outputs = [ "out" "dev" "devdoc" ];

5
pkgs/development/libraries/codec2/default.nix
View file

@ -23,6 +23,11 @@ stdenv.mkDerivation rec {
sed -r -i 's/(\<_Complex)(\s+)(float|double)/\3\2\1/' $out/include/$pname/freedv_api.h
'';
cmakeFlags = [
# RPATH of binary /nix/store/.../bin/freedv_rx contains a forbidden reference to /build/
"-DCMAKE_SKIP_BUILD_RPATH=ON"
];
meta = with lib; {
description = "Speech codec designed for communications quality speech at low data rates";
homepage = "https://www.rowetel.com/codec2.html";

5
pkgs/development/libraries/cpp-netlib/default.nix
View file

@ -19,11 +19,6 @@ stdenv.mkDerivation rec {
"-DCPP-NETLIB_BUILD_SHARED_LIBS=ON"
];
# The test driver binary lacks an RPath to the library's libs
preCheck = ''
export LD_LIBRARY_PATH=$PWD/libs/network/src
'';
# Most tests make network GET requests to various websites
doCheck = false;

2
pkgs/development/libraries/crc32c/default.nix
View file

@ -29,8 +29,6 @@ stdenv.mkDerivation rec {
"-DCRC32C_BUILD_BENCHMARKS=0"
"-DCRC32C_USE_GLOG=0"
"-DBUILD_SHARED_LIBS=${if staticOnly then "0" else "1"}"
] ++ lib.optionals stdenv.isDarwin [
"-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests
];
doCheck = false;

3
pkgs/development/libraries/criterion/default.nix
View file

@ -27,9 +27,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DCTESTS=ON" ];
doCheck = true;
preCheck = ''
export LD_LIBRARY_PATH=`pwd`''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH
'';
checkTarget = "criterion_tests test";
outputs = [ "dev" "out" ];

5
pkgs/development/libraries/ctpp2/default.nix
View file

@ -16,6 +16,11 @@ stdenv.mkDerivation rec {
sed -ie 's/<stdlib.h>/<stdlib.h>\n#include <unistd.h>/' src/CTPP2FileSourceLoader.cpp
'';
cmakeFlags = [
# RPATH of binary /nix/store/.../bin/ctpp2json contains a forbidden reference to /build/
"-DCMAKE_SKIP_BUILD_RPATH=ON"
];
doCheck = false; # fails
meta = with lib; {

Some files were not shown because too many files have changed in this diff Show more