fxlinuxprintutil: init at 1.1.1-1 #65250
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
worldofpeace
suggested changes
Jul 22, 2019
| curlOpts = "--user-agent Mozilla/5.0"; # HTTP 410 otherwise | ||
| }; | ||
|
|
||
| patches = [ ./fxlputil.patch ./fxlputil.tcl.patch ./fxlocalechk.tcl.patch ]; |
There was a problem hiding this comment.
don't think I can appropriately review patches for tcl. did you author them @delan?
There was a problem hiding this comment.
yeah those were my own — fxlputil.tcl.patch replaces the code that looks for Tcl packages in the working directory and /usr/lib or /usr/lib64 with /nix/store/fxlinuxprintutil/lib, while fxlocalechk.tcl.patch replaces the code that looks for X11’s locale.alias in /usr/share/X11/locale or /usr/lib/X11/locale with /nix/store/libX11/share/X11/locale
worldofpeace
approved these changes
Jul 22, 2019
|
Oops, sorry just seeing #65250 (comment). Can you add comment in the nix expression describing the patches or even in the patches? |
|
no worries 😄 diff --git a/pkgs/misc/cups/drivers/fxlinuxprintutil/default.nix b/pkgs/misc/cups/drivers/fxlinuxprintutil/default.nix
index 8082dd1857f..7965b591afb 100644
--- a/pkgs/misc/cups/drivers/fxlinuxprintutil/default.nix
+++ b/pkgs/misc/cups/drivers/fxlinuxprintutil/default.nix
@@ -16,8 +16,16 @@ stdenv.mkDerivation rec {
};
patches = [
+ # replaces references to “path/to/fxlputil” via $0 that are broken by our wrapProgram
+ # with /nix/store/fxlinuxprintutil/bin/fxlputil
./fxlputil.patch
+
+ # replaces the code that looks for Tcl packages in the working directory and /usr/lib
+ # or /usr/lib64 with /nix/store/fxlinuxprintutil/lib
./fxlputil.tcl.patch
+
+ # replaces the code that looks for X11’s locale.alias in /usr/share/X11/locale or
+ # /usr/lib/X11/locale with /nix/store/libX11/share/X11/locale
(substituteAll {
src = ./fxlocalechk.tcl.patch;
inherit (xorg) libX11; |
|
moved misc/cups/drivers/fxlinuxprintutil to misc/cups/fxlinuxprintutil diff --git a/pkgs/misc/cups/drivers/fxlinuxprintutil/default.nix b/pkgs/misc/cups/fxlinuxprintutil/default.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/fxlinuxprintutil/default.nix
rename to pkgs/misc/cups/fxlinuxprintutil/default.nix
diff --git a/pkgs/misc/cups/drivers/fxlinuxprintutil/fxlocalechk.tcl.patch b/pkgs/misc/cups/fxlinuxprintutil/fxlocalechk.tcl.patch
similarity index 100%
rename from pkgs/misc/cups/drivers/fxlinuxprintutil/fxlocalechk.tcl.patch
rename to pkgs/misc/cups/fxlinuxprintutil/fxlocalechk.tcl.patch
diff --git a/pkgs/misc/cups/drivers/fxlinuxprintutil/fxlputil.patch b/pkgs/misc/cups/fxlinuxprintutil/fxlputil.patch
similarity index 100%
rename from pkgs/misc/cups/drivers/fxlinuxprintutil/fxlputil.patch
rename to pkgs/misc/cups/fxlinuxprintutil/fxlputil.patch
diff --git a/pkgs/misc/cups/drivers/fxlinuxprintutil/fxlputil.tcl.patch b/pkgs/misc/cups/fxlinuxprintutil/fxlputil.tcl.patch
similarity index 100%
rename from pkgs/misc/cups/drivers/fxlinuxprintutil/fxlputil.tcl.patch
rename to pkgs/misc/cups/fxlinuxprintutil/fxlputil.tcl.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 851f5b0133f..8d63a12e629 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23912,7 +23912,6 @@ in
brlaser = callPackage ../misc/cups/drivers/brlaser { };
fxlinuxprint = callPackage ../misc/cups/drivers/fxlinuxprint { };
- fxlinuxprintutil = callPackage ../misc/cups/drivers/fxlinuxprintutil { };
brscan4 = callPackage ../applications/graphics/sane/backends/brscan4 { };
@@ -23957,6 +23956,8 @@ in
splix = callPackage ../misc/cups/drivers/splix { };
+ fxlinuxprintutil = callPackage ../misc/cups/fxlinuxprintutil { };
+
steamcontroller = callPackage ../misc/drivers/steamcontroller { };
stern = callPackage ../applications/networking/cluster/stern { }; |
|
moved misc/cups/fxlinuxprintutil to tools/misc/fxlinuxprintutil diff --git a/pkgs/misc/cups/fxlinuxprintutil/default.nix b/pkgs/tools/misc/fxlinuxprintutil/default.nix
similarity index 100%
rename from pkgs/misc/cups/fxlinuxprintutil/default.nix
rename to pkgs/tools/misc/fxlinuxprintutil/default.nix
diff --git a/pkgs/misc/cups/fxlinuxprintutil/fxlocalechk.tcl.patch b/pkgs/tools/misc/fxlinuxprintutil/fxlocalechk.tcl.patch
similarity index 100%
rename from pkgs/misc/cups/fxlinuxprintutil/fxlocalechk.tcl.patch
rename to pkgs/tools/misc/fxlinuxprintutil/fxlocalechk.tcl.patch
diff --git a/pkgs/misc/cups/fxlinuxprintutil/fxlputil.patch b/pkgs/tools/misc/fxlinuxprintutil/fxlputil.patch
similarity index 100%
rename from pkgs/misc/cups/fxlinuxprintutil/fxlputil.patch
rename to pkgs/tools/misc/fxlinuxprintutil/fxlputil.patch
diff --git a/pkgs/misc/cups/fxlinuxprintutil/fxlputil.tcl.patch b/pkgs/tools/misc/fxlinuxprintutil/fxlputil.tcl.patch
similarity index 100%
rename from pkgs/misc/cups/fxlinuxprintutil/fxlputil.tcl.patch
rename to pkgs/tools/misc/fxlinuxprintutil/fxlputil.tcl.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8d63a12e629..1dff6fdf6d4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -782,6 +782,8 @@ in
ezstream = callPackage ../tools/audio/ezstream { };
+ fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { };
+
genymotion = callPackage ../development/mobile/genymotion { };
gamecube-tools = callPackage ../development/tools/gamecube-tools { };
@@ -23956,8 +23958,6 @@ in
splix = callPackage ../misc/cups/drivers/splix { };
- fxlinuxprintutil = callPackage ../misc/cups/fxlinuxprintutil { };
-
steamcontroller = callPackage ../misc/drivers/steamcontroller { };
stern = callPackage ../applications/networking/cluster/stern { }; |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Things done
sandboxinnix.confon non-NixOS)Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)Tested compilation of all pkgs that depend on this change usingnix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)Ensured that relevant documentation is up to date