From c580b57a74e636ad8b896e3d1dfa2b5eade2d192 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Thu, 11 Feb 2021 13:45:11 +0100
Subject: Revert "modules/user/sternenseemann/sway: fix startup by enabling
 opengl"

This reverts commit 5bd756eaf27882820cb59e0ecf9c305f08b3b3e3.

Committed more than I meant to.
---
 pkgs/profpatsch/default.nix      |  5 +----
 pkgs/profpatsch/nman/default.nix | 15 +++++++++++++--
 pkgs/profpatsch/nman/nman.rs     | 34 ----------------------------------
 3 files changed, 14 insertions(+), 40 deletions(-)
 delete mode 100644 pkgs/profpatsch/nman/nman.rs

(limited to 'pkgs')

diff --git a/pkgs/profpatsch/default.nix b/pkgs/profpatsch/default.nix
index cf00f5e0..0528471b 100644
--- a/pkgs/profpatsch/default.nix
+++ b/pkgs/profpatsch/default.nix
@@ -127,9 +127,7 @@ in rec {
   display-infos = callPackage ./display-infos { inherit sfttime; };
   git-commit-index = callPackage ./git-commit-index { inherit script; };
   nix-http-serve = callPackage ./nix-http-serve {};
-  nman = callPackage ./nman {
-    inherit writeRustSimpleBin;
-  };
+  nman = callPackage ./nman {};
   sfttime = callPackage ./sfttime {};
   show-qr-code = callPackage ./show-qr-code {};
   warpspeed = callPackage ./warpspeed {
@@ -166,7 +164,6 @@ in rec {
 
   inherit (import ./write-rust.nix { inherit pkgs runExeclineLocal getBins; })
     writeRustSimple
-    writeRustSimpleBin
     writeRustSimpleLib
     ;
 
diff --git a/pkgs/profpatsch/nman/default.nix b/pkgs/profpatsch/nman/default.nix
index bb4b4544..96699833 100644
--- a/pkgs/profpatsch/nman/default.nix
+++ b/pkgs/profpatsch/nman/default.nix
@@ -1,3 +1,14 @@
-{ writeRustSimpleBin }:
+{ lib, runCommand, go }:
+
+runCommand "nman" {
+  meta = with lib; {
+    description = "Invoke manpage in temporary nix-shell";
+    license = licenses.gpl3;
+  };
+} ''
+    mkdir cache
+    env GOCACHE="$PWD/cache" \
+      ${lib.getBin go}/bin/go build -o nman ${./nman.go}
+    install -D nman $out/bin/nman
+''
 
-writeRustSimpleBin "nman" {} ./nman.rs
diff --git a/pkgs/profpatsch/nman/nman.rs b/pkgs/profpatsch/nman/nman.rs
deleted file mode 100644
index 16bd6271..00000000
--- a/pkgs/profpatsch/nman/nman.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-#[derive(Debug)]
-enum DrvOutput<'a> {
-    Out,
-    Bin,
-    Lib,
-    Man,
-    Dev,
-    DevDoc,
-    DevMan,
-    Other(&'a [u8]),
-}
-
-#[derive(Debug)]
-struct DrvWithOutput<'a> {
-    drv_path: &'a [u8],
-    output: DrvOutput<'a>,
-}
-
-fn parse_drv_path<'a>(path: &'a [u8]) -> Option<DrvWithOutput<'a>> {
-    let mut split = path.split(|c| char::from(c.to_owned()) == '!');
-    split.next().map(|p| DrvWithOutput {
-        drv_path: p,
-        output: split.next().map(|s| DrvOutput::Other(s))
-                            .unwrap_or(DrvOutput::Out),
-    }).and_then(|parsed| match split.next() {
-        Some(_) => None,
-        None => Some(parsed),
-    })
-}
-
-fn main() -> std::io::Result<()> {
-    println!("{:?}", parse_drv_path(b"/nix/store/58i9psln992xjwk8ig1v3l3a4p9sslnp-lowdown-0.7.9.drv"));
-    Ok(())
-}
-- 
cgit 1.4.1