about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--machines/profpatsch/katara.nix6
-rw-r--r--pkgs/default.nix1
-rw-r--r--pkgs/profpatsch/default.nix1
-rw-r--r--pkgs/profpatsch/show-qr-code/default.nix (renamed from pkgs/show-qr-code/default.nix)0
4 files changed, 4 insertions, 4 deletions
diff --git a/machines/profpatsch/katara.nix b/machines/profpatsch/katara.nix
index 9391bd1e..a46b7303 100644
--- a/machines/profpatsch/katara.nix
+++ b/machines/profpatsch/katara.nix
@@ -160,9 +160,9 @@ in {
         youtube-dl           # download videos
         zathura              # pdf viewer
       ];
-      userScripts = with pkgs.vuizvui; [
-        profpatsch.display-infos  # show time & battery
-        show-qr-code              # display a QR code
+      userScripts = with pkgs.vuizvui.profpatsch; [
+        display-infos  # show time & battery
+        show-qr-code   # display a QR code
       ];
       mailPkgs = [
         elinks               # command line browser
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 23e4bf98..8303e0a5 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -34,7 +34,6 @@ let
     mkChannel = callPackage ./build-support/channel.nix { };
 
     list-gamecontrollers = callPackage ./list-gamecontrollers { };
-    show-qr-code = callPackage ./show-qr-code { };
 
     games = import ./games {
       inherit pkgs;
diff --git a/pkgs/profpatsch/default.nix b/pkgs/profpatsch/default.nix
index d5b57628..51927fba 100644
--- a/pkgs/profpatsch/default.nix
+++ b/pkgs/profpatsch/default.nix
@@ -6,6 +6,7 @@
   warpspeed = callPackage ./warpspeed {
     inherit (haskellPackages) ghcWithPackages;
   };
+  show-qr-code = callPackage ./show-qr-code { };
 
   jmtpfs = jmtpfs.override {
     libmtp = libmtp.overrideDerivation (old: {
diff --git a/pkgs/show-qr-code/default.nix b/pkgs/profpatsch/show-qr-code/default.nix
index 17d9847a..17d9847a 100644
--- a/pkgs/show-qr-code/default.nix
+++ b/pkgs/profpatsch/show-qr-code/default.nix