From 117067cd30812fb4fdcadd15f1bdef08b9a88b64 Mon Sep 17 00:00:00 2001 From: Diratof Azdimarlow Date: Sun, 18 Aug 2024 19:47:02 +0500 Subject: [PATCH 1/4] delete unneccessary and make flake --- flake.nix | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 flake.nix diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..fcb834b --- /dev/null +++ b/flake.nix @@ -0,0 +1,35 @@ +{ + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + }; + outputs = { self, nixpkgs, ... }: { + devShells."x86_64-linux".default = let + pkgs = import nixpkgs { + system = "x86_64-linux"; + }; + in pkgs.mkShell { + nativeBuildInputs = with pkgs; let + fixWrapper = pkgs.runCommand "fix-wrapper" {} '' + mkdir -p $out/bin + for i in ${pkgs.gcc.cc}/bin/*-gnu-gcc*; do + ln -s ${pkgs.gcc}/bin/gcc $out/bin/$(basename "$i") + done + for i in ${pkgs.gcc.cc}/bin/*-gnu-{g++,c++}*; do + ln -s ${pkgs.gcc}/bin/g++ $out/bin/$(basename "$i") + done + ''; + in[ + binutils + #fixWrapper + clang + git + #glibc.static + musl + gnumake + pkg-config + util-linux + ]; + hardeningDisable = [ "all" ]; + }; + }; +} From 5418372e77f88c39713962f3bfab81bbf1c9f751 Mon Sep 17 00:00:00 2001 From: Diratof Azdimarlow Date: Sun, 18 Aug 2024 19:56:52 +0500 Subject: [PATCH 2/4] fixed --- flake.nix | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/flake.nix b/flake.nix index fcb834b..9df5b91 100644 --- a/flake.nix +++ b/flake.nix @@ -2,12 +2,12 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; }; - outputs = { self, nixpkgs, ... }: { - devShells."x86_64-linux".default = let - pkgs = import nixpkgs { - system = "x86_64-linux"; - }; - in pkgs.mkShell { + outputs = { self, nixpkgs, ... }: let + pkgs = import nixpkgs { + system = "x86_64-linux"; + }; + in { + devShells."x86_64-linux".default = pkgs.mkShell { nativeBuildInputs = with pkgs; let fixWrapper = pkgs.runCommand "fix-wrapper" {} '' mkdir -p $out/bin @@ -19,17 +19,25 @@ done ''; in[ - binutils - #fixWrapper - clang - git - #glibc.static - musl - gnumake - pkg-config - util-linux + gnumake pkg-config systemDlibs libusb1 ]; hardeningDisable = [ "all" ]; }; + packages."x86_64-linux".default = pkgs.stdenv.mkDerivation { + name = "ch341prog"; + pname = "ch341prog"; + version = "ch341prog"; + src = ./.; + buildInputs = with pkgs; [ + gcc gnumake libusb1 systemdLibs + ]; + buildPhase = '' + gcc ch341a.c main.c -o ch341prog -lusb-1.0 + ''; + installPhase = '' + mkdir -p $out/bin + cp ch341prog $out/bin + ''; + }; }; } From e4c6b618f5e7b53bc759c8c95847ff1dfe516f40 Mon Sep 17 00:00:00 2001 From: Diratof Azdimarlow Date: Sat, 24 Aug 2024 02:40:34 +0500 Subject: [PATCH 3/4] added flake.lock --- flake.lock | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 flake.lock diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..da388cb --- /dev/null +++ b/flake.lock @@ -0,0 +1,27 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1723891200, + "narHash": "sha256-uljX21+D/DZgb9uEFFG2dkkQbPZN+ig4Z6+UCLWFVAk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a0d6390cb3e82062a35d0288979c45756e481f60", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} From 019b470486386170456befbbff2f211f843df702 Mon Sep 17 00:00:00 2001 From: Diratof Azdimarlow Date: Sat, 24 Aug 2024 02:57:47 +0500 Subject: [PATCH 4/4] flushed garbage --- flake.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/flake.nix b/flake.nix index 9df5b91..bd16170 100644 --- a/flake.nix +++ b/flake.nix @@ -2,23 +2,13 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; }; - outputs = { self, nixpkgs, ... }: let + outputs = { nixpkgs, ... }: let pkgs = import nixpkgs { system = "x86_64-linux"; }; in { devShells."x86_64-linux".default = pkgs.mkShell { - nativeBuildInputs = with pkgs; let - fixWrapper = pkgs.runCommand "fix-wrapper" {} '' - mkdir -p $out/bin - for i in ${pkgs.gcc.cc}/bin/*-gnu-gcc*; do - ln -s ${pkgs.gcc}/bin/gcc $out/bin/$(basename "$i") - done - for i in ${pkgs.gcc.cc}/bin/*-gnu-{g++,c++}*; do - ln -s ${pkgs.gcc}/bin/g++ $out/bin/$(basename "$i") - done - ''; - in[ + nativeBuildInputs = with pkgs; [ gnumake pkg-config systemDlibs libusb1 ]; hardeningDisable = [ "all" ]; @@ -26,7 +16,7 @@ packages."x86_64-linux".default = pkgs.stdenv.mkDerivation { name = "ch341prog"; pname = "ch341prog"; - version = "ch341prog"; + version = "9999"; src = ./.; buildInputs = with pkgs; [ gcc gnumake libusb1 systemdLibs