diff --git a/flake.lock b/flake.lock index daf37b8..9e70e85 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1758791193, - "narHash": "sha256-F8WmEwFoHsnix7rt290R0rFXNJiMbClMZyIC/e+HYf0=", + "lastModified": 1739357830, + "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "25e53aa156d47bad5082ff7618f5feb1f5e02d01", + "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 9567822..f619fe0 100644 --- a/flake.nix +++ b/flake.nix @@ -2,11 +2,11 @@ description = "Flake for the servicepoint library."; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; }; outputs = - { + inputs@{ self, nixpkgs, }: @@ -24,45 +24,15 @@ system: f rec { pkgs = nixpkgs.legacyPackages.${system}; - selfPkgs = self.packages.${system}; inherit system; } ); in - { - packages = forAllSystems ( - { pkgs, selfPkgs, ... }: - { - servicepoint-binding-uniffi = pkgs.rustPlatform.buildRustPackage { - pname = "servicepoint-binding-uniffi"; - version = "0.13.1"; - - src = ./.; - cargoDeps = pkgs.rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }; - - nativeBuildInputs = with pkgs; [ - pkg-config - ]; - - buildInputs = with pkgs; [ - xe - xz - ]; - - postInstall = '' - mkdir -p $out/lib/pkgconfig - sed "s:\$out:$out:g" ${./servicepoint-binding-uniffi.pc.in} | sed "s:\$version:$version:g" > $out/lib/pkgconfig/servicepoint-binding-uniffi.pc - ''; - }; - default = selfPkgs.servicepoint-binding-uniffi; - } - ); - + rec { devShells = forAllSystems ( - { pkgs, selfPkgs, ... }: + { pkgs, system }: { - default = pkgs.mkShell { - inputsFrom = [ selfPkgs.default ]; + default = pkgs.mkShell rec { packages = with pkgs; [ (pkgs.symlinkJoin { name = "rust-toolchain"; @@ -76,12 +46,15 @@ cargo-tarpaulin ]; }) + xe + xz + pkg-config ]; RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}"; }; } ); - formatter = forAllSystems ({ pkgs, ... }: pkgs.nixfmt-tree); + formatter = forAllSystems ({ pkgs, ... }: pkgs.nixfmt-rfc-style); }; } diff --git a/servicepoint-binding-uniffi.pc.in b/servicepoint-binding-uniffi.pc.in deleted file mode 100644 index 622867c..0000000 --- a/servicepoint-binding-uniffi.pc.in +++ /dev/null @@ -1,5 +0,0 @@ -Name: servicepoint-binding-uniffi -Description: UniFFI bindings for the servicepoint library -Version: $version -URL: https://git.berlin.ccc.de/servicepoint/servicepoint-binding-uniffi -Libs: -L$out/lib -lservicepoint_binding_uniffi