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

Merge pull request #209510 from Artturin/splicefixes1

Browse Source
This commit is contained in:
Artturi 2023-01-09 19:43:38 +02:00 committed by GitHub
commit 9b57639919
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/editors/vscode/generic.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, makeDesktopItem
, unzip, libsecret, libXScrnSaver, libxshmfence, wrapGAppsHook, makeWrapper
, unzip, libsecret, libXScrnSaver, libxshmfence, buildPackages
, atomEnv, at-spi2-atk, autoPatchelfHook
, systemd, fontconfig, libdbusmenu, glib, buildFHSUserEnvBubblewrap, wayland
@ -72,7 +72,8 @@ let
++ lib.optionals stdenv.isLinux [
autoPatchelfHook
nodePackages.asar
(wrapGAppsHook.override { inherit makeWrapper; })
# override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651
(buildPackages.wrapGAppsHook.override { inherit (buildPackages) makeWrapper; })
];
dontBuild = true;

2
pkgs/development/tools/icr/default.nix
View File

@ -33,7 +33,7 @@ crystal.buildCrystalPackage rec {
postFixup = ''
wrapProgram $out/bin/icr \
--prefix PATH : ${lib.makeBinPath [ crystal shards makeWrapper which ]}
--prefix PATH : ${lib.makeBinPath [ crystal shards which ]}
'';
meta = with lib; {

5
pkgs/top-level/all-packages.nix
View File

@ -13386,8 +13386,9 @@ with pkgs;
yarn = callPackage ../development/tools/yarn { };
yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { };
yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { pkgs = pkgs.__splicedPackages; };
yarn2nix-moretea-openssl_1_1 = callPackage ../development/tools/yarn2nix-moretea/yarn2nix {
pkgs = pkgs.__splicedPackages;
nodejs = nodejs.override { openssl = openssl_1_1; };
};
@ -34851,7 +34852,7 @@ with pkgs;
otto-matic = callPackage ../games/otto-matic { };
openraPackages = import ../games/openra pkgs;
openraPackages = import ../games/openra pkgs.__splicedPackages;
openra = openraPackages.engines.release;