summary refs log tree commit diff
path: root/pkgs/os-specific/linux/firmware
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2019-09-21 20:05:09 +0200
committerVladimír Čunát <v@cunat.cz>2019-09-21 20:05:09 +0200
commitf8a8fc6c7c079de430fa528f688ddac781bcef16 (patch)
tree08c4f42540499cdac0331e8727cde16baabd08f4 /pkgs/os-specific/linux/firmware
parent6be720b3a756662bb31adfdc1948553a02057c16 (diff)
downloadnixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar
nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.gz
nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.bz2
nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.lz
nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.xz
nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.zst
nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.zip
Revert "Merge branch 'staging-next'"
This reverts commit 41af38f3728bd64b80721c44ed1fb019978cbc1b, reversing
changes made to f0fec244ca380b9d3e617ee7b419c59758c8b0f1.

Let's delay this.  We have some serious regressions.
Diffstat (limited to 'pkgs/os-specific/linux/firmware')
-rw-r--r--pkgs/os-specific/linux/firmware/fwupd/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix
index 75144799d01..9fdf9ca0bc1 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix
@@ -237,9 +237,9 @@ stdenv.mkDerivation rec {
   postFixup = ''
     find -L "$out/bin" "$out/libexec" -type f -executable -print0 \
       | while IFS= read -r -d ''' file; do
-      if [[ "$file" != *.efi ]]; then
-        echo "Wrapping program $file"
-        wrapGApp "$file"
+      if [[ "''${file}" != *.efi ]]; then
+        echo "Wrapping program ''${file}"
+        wrapProgram "''${file}" "''${gappsWrapperArgs[@]}"
       fi
     done
   '';