summary refs log tree commit diff
path: root/pkgs/desktops/plasma-5/breeze-plymouth
diff options
context:
space:
mode:
authorV <v@anomalous.eu>2020-08-25 11:43:59 +0200
committerV <v@anomalous.eu>2020-09-03 19:15:05 +0200
commit79921889a05a3e7f2450a82fbaadd3dd552d3806 (patch)
tree9b94d766a09c860110ddd142b417564d4fa1cdc6 /pkgs/desktops/plasma-5/breeze-plymouth
parentc25a7cd8468eeeed82d7444855c10552ab3452ba (diff)
downloadnixpkgs-79921889a05a3e7f2450a82fbaadd3dd552d3806.tar
nixpkgs-79921889a05a3e7f2450a82fbaadd3dd552d3806.tar.gz
nixpkgs-79921889a05a3e7f2450a82fbaadd3dd552d3806.tar.bz2
nixpkgs-79921889a05a3e7f2450a82fbaadd3dd552d3806.tar.lz
nixpkgs-79921889a05a3e7f2450a82fbaadd3dd552d3806.tar.xz
nixpkgs-79921889a05a3e7f2450a82fbaadd3dd552d3806.tar.zst
nixpkgs-79921889a05a3e7f2450a82fbaadd3dd552d3806.zip
treewide: convert patch series files to Nix expressions
Nix expressions provide all the features that Quilt series files have,
so using those instead is pointless. Also, lib.readPathsFromFile
(the function used to read series files) has the following warning:

> NOTE: This function is not performant and should be avoided.

This also removes some orphaned series files, and unused references to
copyPathsToStore (which were probably missed in previous commits
where calls to lib.readPathsFromFile were removed)
Diffstat (limited to 'pkgs/desktops/plasma-5/breeze-plymouth')
-rw-r--r--pkgs/desktops/plasma-5/breeze-plymouth/default.nix5
-rw-r--r--pkgs/desktops/plasma-5/breeze-plymouth/series1
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
index 770e549fc2c..36ac01725ea 100644
--- a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
+++ b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
@@ -1,7 +1,6 @@
 {
   mkDerivation,
   lib,
-  copyPathsToStore,
   extra-cmake-modules,
   plymouth,
   nixos-icons,
@@ -28,7 +27,9 @@ mkDerivation {
   name = "breeze-plymouth";
   nativeBuildInputs = [ extra-cmake-modules ] ++ lib.optionals (logoFile != null) [ imagemagick netpbm perl ];
   buildInputs = [ plymouth ];
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  patches = [
+    ./install-paths.patch
+  ];
   cmakeFlags = []
     ++ lib.optional (osName      != null) "-DDISTRO_NAME=${osName}"
     ++ lib.optional (osVersion   != null) "-DDISTRO_VERSION=${osVersion}"
diff --git a/pkgs/desktops/plasma-5/breeze-plymouth/series b/pkgs/desktops/plasma-5/breeze-plymouth/series
deleted file mode 100644
index 8920e7ca518..00000000000
--- a/pkgs/desktops/plasma-5/breeze-plymouth/series
+++ /dev/null
@@ -1 +0,0 @@
-install-paths.patch