From 8bc10fbc56db2aaf1f234349e4d0c7607b8ead4f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 12 Jun 2021 11:21:35 -0500 Subject: [PATCH 01/10] Add gcc for emacs wrapper so native-comp works MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On macos, we don’t have a gcc executable by default, which is required for some reason when compiling site-start. --- .../editors/emacs/elisp-packages/elpa-packages.nix | 3 ++- pkgs/build-support/emacs/elpa.nix | 4 ++-- pkgs/build-support/emacs/generic.nix | 4 +++- pkgs/build-support/emacs/melpa.nix | 4 ++-- pkgs/build-support/emacs/wrapper.nix | 7 +++++-- pkgs/top-level/emacs-packages.nix | 4 ++-- 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 02a9a6e6562..cefed111f4f 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -21,7 +21,7 @@ formats commits for you. */ -{ lib, stdenv, texinfo, writeText }: +{ lib, stdenv, texinfo, writeText, gcc }: self: let @@ -34,6 +34,7 @@ self: let elpaBuild = import ../../../../build-support/emacs/elpa.nix { inherit lib stdenv texinfo writeText; inherit (self) emacs; + inherit gcc; }; generateElpa = lib.makeOverridable ({ diff --git a/pkgs/build-support/emacs/elpa.nix b/pkgs/build-support/emacs/elpa.nix index 41a0670d0c8..965b8d8189a 100644 --- a/pkgs/build-support/emacs/elpa.nix +++ b/pkgs/build-support/emacs/elpa.nix @@ -1,6 +1,6 @@ # builder for Emacs packages built for packages.el -{ lib, stdenv, emacs, texinfo, writeText }: +{ lib, stdenv, emacs, texinfo, writeText, gcc }: with lib; @@ -19,7 +19,7 @@ let in -import ./generic.nix { inherit lib stdenv emacs texinfo writeText; } ({ +import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({ phases = "installPhase fixupPhase distPhase"; diff --git a/pkgs/build-support/emacs/generic.nix b/pkgs/build-support/emacs/generic.nix index 1456d9e423d..ef154982ad0 100644 --- a/pkgs/build-support/emacs/generic.nix +++ b/pkgs/build-support/emacs/generic.nix @@ -1,6 +1,6 @@ # generic builder for Emacs packages -{ lib, stdenv, emacs, texinfo, writeText, ... }: +{ lib, stdenv, emacs, texinfo, writeText, gcc, ... }: with lib; @@ -72,6 +72,8 @@ stdenv.mkDerivation ({ LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib"; + nativeBuildInputs = [ gcc ]; + addEmacsNativeLoadPath = true; postInstall = '' diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix index 824611b20c8..5c41a66970e 100644 --- a/pkgs/build-support/emacs/melpa.nix +++ b/pkgs/build-support/emacs/melpa.nix @@ -1,7 +1,7 @@ # builder for Emacs packages built for packages.el # using MELPA package-build.el -{ lib, stdenv, fetchFromGitHub, emacs, texinfo, writeText }: +{ lib, stdenv, fetchFromGitHub, emacs, texinfo, writeText, gcc }: with lib; @@ -28,7 +28,7 @@ let in -import ./generic.nix { inherit lib stdenv emacs texinfo writeText; } ({ +import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({ ename = if ename == null diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index 571d0eb687c..6b53f3fdd95 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -32,7 +32,7 @@ in customEmacsPackages.emacs.pkgs.withPackages (epkgs: [ epkgs.evil epkgs.magit */ -{ lib, lndir, makeWrapper, runCommand }: self: +{ lib, lndir, makeWrapper, runCommand, gcc }: self: with lib; @@ -65,7 +65,10 @@ runCommand # Store all paths we want to add to emacs here, so that we only need to add # one path to the load lists deps = runCommand "emacs-packages-deps" - { inherit explicitRequires lndir emacs; } + { + inherit explicitRequires lndir emacs; + nativeBuildInputs = lib.optional nativeComp gcc; + } '' findInputsOld() { local pkg="$1"; shift diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index d168d34e373..34f99561601 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -26,7 +26,7 @@ let mkElpaPackages = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/elpa-packages.nix { - inherit (pkgs) stdenv texinfo writeText; + inherit (pkgs) stdenv texinfo writeText gcc; inherit lib; }; @@ -44,7 +44,7 @@ let }; emacsWithPackages = { pkgs, lib }: import ../build-support/emacs/wrapper.nix { - inherit (pkgs) makeWrapper runCommand; + inherit (pkgs) makeWrapper runCommand gcc; inherit (pkgs.xorg) lndir; inherit lib; }; From 82003f428c6c4a6912781545067d5da4bff4881a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 24 Jun 2021 12:33:40 -0500 Subject: [PATCH 02/10] Update pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix Co-authored-by: Sandro --- .../editors/emacs/elisp-packages/elpa-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index cefed111f4f..69db13fec19 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -32,9 +32,8 @@ self: let }; elpaBuild = import ../../../../build-support/emacs/elpa.nix { - inherit lib stdenv texinfo writeText; + inherit lib stdenv texinfo writeText gcc; inherit (self) emacs; - inherit gcc; }; generateElpa = lib.makeOverridable ({ From 61ab7e84de28ec85dc026a88301f7aa63d2aa1d7 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sun, 11 Jul 2021 22:11:21 -0700 Subject: [PATCH 03/10] linuxManualConfig: patch all shebangs in scripts/ There are many scripts in `scripts/` which may be called by the build, depending on how the user chooses to configure the kernel. For example, `scripts/jobserver-exec` is called whenever the kernel is being built with LLVM tooling, and without this patch that build will fail due to the broken shebang. This patch makes us fix _all_ scripts, as well as add a dependency on python3Minimal, since a lot of the aforementioned scripts are written in Python3 instead of shell. --- pkgs/os-specific/linux/kernel/manual-config.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index fda2881a8d2..d40a36936a2 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,5 +1,5 @@ { lib, buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl -, libelf, cpio, elfutils, zstd, gawk +, libelf, cpio, elfutils, zstd, gawk, python3Minimal , writeTextFile }: @@ -121,7 +121,7 @@ let # See also https://kernelnewbies.org/BuildId sed -i Makefile -e 's|--build-id=[^ ]*|--build-id=none|' - patchShebangs scripts/ld-version.sh + patchShebangs scripts ''; postPatch = '' @@ -307,7 +307,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat enableParallelBuilding = true; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr gawk zstd ] + nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr gawk zstd python3Minimal ] ++ optional (stdenv.hostPlatform.linux-kernel.target == "uImage") buildPackages.ubootTools ++ optional (lib.versionAtLeast version "4.14" && lib.versionOlder version "5.8") libelf # Removed util-linuxMinimal since it should not be a dependency. From 89deec56234511babe7478a44f684afcec83b394 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sun, 11 Jul 2021 21:55:40 -0700 Subject: [PATCH 04/10] buildLinux: apply hostPlatform.linux-kernel.makeFlags to generate-config.pl This enforces that the configuration generated will obey any/all flags set in the platform/stdenv configuration. This is crucial, for example, if you'd like to build a kernel using clang. Without this patch, anything you set in `stdenv.hostPlatform.linux-kernel.makeFlags` is wholly ignored during config generation, causing (for example) any changes in the desired toolchain (e.g. `LLVM`, `LLVM_IAS`) to not be reflected in the generated config, and for the subsequent build to fail. --- pkgs/os-specific/linux/kernel/generate-config.pl | 3 ++- pkgs/os-specific/linux/kernel/generic.nix | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/generate-config.pl b/pkgs/os-specific/linux/kernel/generate-config.pl index 82e1cb66e2b..df807188f14 100644 --- a/pkgs/os-specific/linux/kernel/generate-config.pl +++ b/pkgs/os-specific/linux/kernel/generate-config.pl @@ -19,6 +19,7 @@ my $autoModules = $ENV{'AUTO_MODULES'}; my $preferBuiltin = $ENV{'PREFER_BUILTIN'}; my $ignoreConfigErrors = $ENV{'ignoreConfigErrors'}; my $buildRoot = $ENV{'BUILD_ROOT'}; +my $makeFlags = $ENV{'MAKE_FLAGS'}; $SIG{PIPE} = 'IGNORE'; # Read the answers. @@ -40,7 +41,7 @@ close ANSWERS; sub runConfig { # Run `make config'. - my $pid = open2(\*IN, \*OUT, "make -C $ENV{SRC} O=$buildRoot config SHELL=bash ARCH=$ENV{ARCH} CC=$ENV{CC} HOSTCC=$ENV{HOSTCC} HOSTCXX=$ENV{HOSTCXX}"); + my $pid = open2(\*IN, \*OUT, "make -C $ENV{SRC} O=$buildRoot config SHELL=bash ARCH=$ENV{ARCH} CC=$ENV{CC} HOSTCC=$ENV{HOSTCC} HOSTCXX=$ENV{HOSTCXX} $makeFlags"); # Parse the output, look for questions and then send an # appropriate answer. diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index b35c84513e6..f208da7f30e 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -116,6 +116,8 @@ let # e.g. "bzImage" kernelTarget = stdenv.hostPlatform.linux-kernel.target; + makeFlags = lib.optionals (stdenv.hostPlatform.linux-kernel ? makeFlags) stdenv.hostPlatform.linux-kernel.makeFlags; + prePatch = kernel.prePatch + '' # Patch kconfig to print "###" after every question so that # generate-config.pl from the generic builder can answer them. @@ -137,13 +139,15 @@ let make -C . O="$buildRoot" $kernelBaseConfig \ ARCH=$kernelArch \ HOSTCC=$HOSTCC HOSTCXX=$HOSTCXX HOSTAR=$HOSTAR HOSTLD=$HOSTLD \ - CC=$CC OBJCOPY=$OBJCOPY OBJDUMP=$OBJDUMP READELF=$READELF + CC=$CC OBJCOPY=$OBJCOPY OBJDUMP=$OBJDUMP READELF=$READELF \ + $makeFlags # Create the config file. echo "generating kernel configuration..." ln -s "$kernelConfigPath" "$buildRoot/kernel-config" DEBUG=1 ARCH=$kernelArch KERNEL_CONFIG="$buildRoot/kernel-config" AUTO_MODULES=$autoModules \ - PREFER_BUILTIN=$preferBuiltin BUILD_ROOT="$buildRoot" SRC=. perl -w $generateConfig + PREFER_BUILTIN=$preferBuiltin BUILD_ROOT="$buildRoot" SRC=. MAKE_FLAGS="$makeFlags" \ + perl -w $generateConfig ''; installPhase = "mv $buildRoot/.config $out"; From ea167e8ccbcae6a3378e622255d9705d26f33058 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sun, 11 Jul 2021 21:58:16 -0700 Subject: [PATCH 05/10] buildLinux: take and propagate extraMakeFlags This is just for practicity, as it allows users of buildLinux to pass along extra flags they need in the kernel's make invocation. This makes, for example, supporting LLVM _much_ easier, and could enable us in the future to provide clang-built kernels. --- pkgs/os-specific/linux/kernel/generic.nix | 13 +++++++++---- pkgs/os-specific/linux/kernel/manual-config.nix | 8 ++++++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index f208da7f30e..29557b8d9e2 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -21,6 +21,9 @@ , # Legacy overrides to the intermediate kernel config, as string extraConfig ? "" + # Additional make flags passed to kbuild +, extraMakeFlags ? [] + , # kernel intermediate config overrides, as a set structuredExtraConfig ? {} @@ -97,7 +100,7 @@ let in lib.concatStringsSep "\n" ([baseConfigStr] ++ configFromPatches); configfile = stdenv.mkDerivation { - inherit ignoreConfigErrors autoModules preferBuiltin kernelArch; + inherit ignoreConfigErrors autoModules preferBuiltin kernelArch extraMakeFlags; pname = "linux-config"; inherit version; @@ -116,7 +119,8 @@ let # e.g. "bzImage" kernelTarget = stdenv.hostPlatform.linux-kernel.target; - makeFlags = lib.optionals (stdenv.hostPlatform.linux-kernel ? makeFlags) stdenv.hostPlatform.linux-kernel.makeFlags; + makeFlags = lib.optionals (stdenv.hostPlatform.linux-kernel ? makeFlags) stdenv.hostPlatform.linux-kernel.makeFlags + ++ extraMakeFlags; prePatch = kernel.prePatch + '' # Patch kconfig to print "###" after every question so that @@ -136,7 +140,8 @@ let export HOSTLD=$LD_FOR_BUILD # Get a basic config file for later refinement with $generateConfig. - make -C . O="$buildRoot" $kernelBaseConfig \ + make $makeFlags \ + -C . O="$buildRoot" $kernelBaseConfig \ ARCH=$kernelArch \ HOSTCC=$HOSTCC HOSTCXX=$HOSTCXX HOSTAR=$HOSTAR HOSTLD=$HOSTLD \ CC=$CC OBJCOPY=$OBJCOPY OBJDUMP=$OBJDUMP READELF=$READELF \ @@ -176,7 +181,7 @@ let }; # end of configfile derivation kernel = (callPackage ./manual-config.nix {}) { - inherit version modDirVersion src kernelPatches randstructSeed lib stdenv extraMeta configfile; + inherit version modDirVersion src kernelPatches randstructSeed lib stdenv extraMakeFlags extraMeta configfile; config = { CONFIG_MODULES = "y"; CONFIG_FW_LOADER = "m"; }; }; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index d40a36936a2..77add0aef53 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -19,6 +19,8 @@ in { stdenv, # The kernel version version, + # Additional kernel make flags + extraMakeFlags ? [], # The version of the kernel module directory modDirVersion ? version, # The kernel source (tarball, git checkout, etc.) @@ -173,7 +175,9 @@ let "KBUILD_BUILD_VERSION=1-NixOS" kernelConf.target "vmlinux" # for "perf" and things like that - ] ++ optional isModular "modules"; + ] + ++ optional isModular "modules" + ++ extraMakeFlags; installFlags = [ "INSTALLKERNEL=${installkernel}" @@ -325,7 +329,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat "ARCH=${stdenv.hostPlatform.linuxArch}" ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" - ]; + ] ++ extraMakeFlags; karch = stdenv.hostPlatform.linuxArch; }) From e21183a95d81e0cd5b7d15d73373ac2e9195114f Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 13 Jul 2021 02:18:32 -0700 Subject: [PATCH 06/10] buildLinux: preserve structuredExtraConfig and extraMakeFlags in passthru This allows users to override custom kernel packages (e.g. linux_xanmod) that set their own structuredExtraConfig with ease. --- pkgs/os-specific/linux/kernel/generic.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 29557b8d9e2..aa0f19858b8 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -160,7 +160,6 @@ let enableParallelBuilding = true; passthru = rec { - module = import ../../../../nixos/modules/system/boot/kernel_config.nix; # used also in apache # { modules = [ { options = res.options; config = svc.config or svc; } ]; @@ -188,7 +187,7 @@ let passthru = { features = kernelFeatures; - inherit commonStructuredConfig isZen isHardened isLibre modDirVersion; + inherit commonStructuredConfig structuredExtraConfig extraMakeFlags isZen isHardened isLibre modDirVersion; isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true; kernelOlder = lib.versionOlder version; kernelAtLeast = lib.versionAtLeast version; From 65394f22e2e1dac3f80bb7042185faaded5aa05c Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Wed, 14 Jul 2021 23:10:58 +0200 Subject: [PATCH 07/10] wmctrl: support cross-compilation Add dependencies on correct place for cross-compiling. Fix issue where 'glib.h' cannot be found when cross-compiling. --- pkgs/tools/X11/wmctrl/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/X11/wmctrl/default.nix b/pkgs/tools/X11/wmctrl/default.nix index 0a01a3dad5a..19a464aff72 100644 --- a/pkgs/tools/X11/wmctrl/default.nix +++ b/pkgs/tools/X11/wmctrl/default.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation rec { sha256 = "1afclc57b9017a73mfs9w7lbdvdipmf9q0xdk116f61gnvyix2np"; }; - nativeBuildInputs = [ pkg-config ]; + strictDeps = true; + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ glib.dev ]; buildInputs = [ libX11 libXmu glib ]; patches = [ ./64-bit-data.patch ]; From ccac09f2ebbc5f8b102e0a5f8e0d5cd02a181028 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Thu, 15 Jul 2021 23:57:01 +0200 Subject: [PATCH 08/10] consul: 1.10.0 -> 1.10.1 --- pkgs/servers/consul/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index c259f962b04..da0e7364e95 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.10.0"; + version = "1.10.1"; rev = "v${version}"; # Note: Currently only release tags are supported, because they have the Consul UI @@ -17,7 +17,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "sha256:0gc5shz1nbya7jdkggw2izbw1p4lwkbqgbc5ihlvnwrfdgksfqqd"; + sha256 = "sha256-oap0pXqtIbT9wMfD/RuJ2tTRynSvfzsgL8TyY4nj3sM="; }; passthru.tests.consul = nixosTests.consul; @@ -26,7 +26,7 @@ buildGoModule rec { # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - vendorSha256 = "sha256:0sxnnzzsp58ma42ylysdgxibqf65f4f9vbf8c20r44426vg75as7"; + vendorSha256 = "sha256-DloQGxeooVhYWA5/ICkL2UEQvNPilb2F5pst78UzWPI="; doCheck = false; From d3ebf3bfa10b4e18385f3792c69f76f5be7e1b04 Mon Sep 17 00:00:00 2001 From: Artturi Date: Fri, 16 Jul 2021 04:06:00 +0300 Subject: [PATCH 09/10] oath-toolkit: fix darwin build by disabling pam (#130301) --- pkgs/tools/security/oath-toolkit/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix index a925d07cb7c..e542a2ae714 100644 --- a/pkgs/tools/security/oath-toolkit/default.nix +++ b/pkgs/tools/security/oath-toolkit/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, pam, xmlsec }: let + # TODO: Switch to OpenPAM once https://gitlab.com/oath-toolkit/oath-toolkit/-/issues/26 is addressed upstream securityDependency = if stdenv.isDarwin then xmlsec else pam; @@ -16,6 +17,8 @@ in stdenv.mkDerivation rec { buildInputs = [ securityDependency ]; + configureFlags = lib.optionals stdenv.isDarwin [ "--disable-pam" ]; + passthru.updateScript = ./update.sh; meta = with lib; { From 37d73021ee8324e868dbd8c67d1b8ced969fc161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Thu, 15 Jul 2021 17:26:30 -0500 Subject: [PATCH 10/10] idris2: fix packagePaths issue packagePaths changed between idris2 `v0.3.0` and `v0.4.0` and now includes a version number in the path. Fixes nixos/nixpkgs#130310 Co-authored-by: zseri Co-authored-by: Mario Rodas --- pkgs/development/compilers/idris2/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/idris2/default.nix b/pkgs/development/compilers/idris2/default.nix index ac0f3312414..c399772a9f3 100644 --- a/pkgs/development/compilers/idris2/default.nix +++ b/pkgs/development/compilers/idris2/default.nix @@ -48,7 +48,8 @@ stdenv.mkDerivation rec { postInstall = let includedLibs = [ "base" "contrib" "network" "prelude" ]; name = "${pname}-${version}"; - packagePaths = builtins.map (l: "$out/${name}/" + l) includedLibs; + packagePaths = + builtins.map (l: "$out/${name}/${l}-${version}") includedLibs; additionalIdris2Paths = builtins.concatStringsSep ":" packagePaths; in '' # Remove existing idris2 wrapper that sets incorrect LD_LIBRARY_PATH